Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.4rc1, 0.4rc2, and 0.4rc3

merge with dev

Changeset 8ff46ff6d00d…

Parents 893b9d91abb9…

Parents e4ba1a3dddf5…

by Steve Borho

Changes to one file · Browse files at 8ff46ff6d00d Showing diff from parent 893b9d91abb9 e4ba1a3dddf5 Diff from another changeset...

Change 1 of 1 Show Entire File tortoise/​test/​testiconoverlay.py Stacked
 
107
108
109
110
111
 
 
112
113
114
 
107
108
109
 
 
110
111
112
113
114
@@ -107,8 +107,8 @@
  if option.has_key('--time'):   timeit()   - if option.has_key('--lsprod'): - lsprof(get_states) # fixme: lsprof traceback on win32 (only?) + if option.has_key('--lsprof'): + lsprof(get_states)   elif option.has_key('--profile'):   profile(get_states)   else: