Merge branch 'master' into singularity

2014-11-29 21:53:22 -05:00
parent 88ee1d60be 9a8642e789
commit 7100e8997b
21 changed files with 976 additions and 651 deletions
--- a/gui/itemStats.py
+++ b/gui/itemStats.py
@@ -32,7 +32,7 @@ import config
 try:
    from collections import OrderedDict
 except ImportError:
-    from gui.utils.compat import OrderedDict
+    from utils.compat import OrderedDict

 class ItemStatsDialog(wx.Dialog):
    counter = 0