Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.1, 1.1.1, and 1.1.2

Merge with stable

Changeset 22cf3fe8b374

Parents 1f6ed7f04f15

Parents 05950a39ef68

by Adrian Buehlmann

Changes to one file · Browse files at 22cf3fe8b374 Showing diff from parent 1f6ed7f04f15 05950a39ef68 Diff from another changeset...

 
74
75
76
77
 
78
79
80
 
74
75
76
 
77
78
79
80
@@ -74,7 +74,7 @@
  arch = 'x64'   elif archval == 0:   arch = 'x86' - except ImportError: + except (ImportError, AttributeError):   pass   text += '** Processor architecture: %s\n' % arch   text += self.opts['error']