Merge branch 'master' into wx3

2014-12-12 14:42:25 +03:00
parent ff55f2817b 5adaaac75e
commit 3c1bf22e87
104 changed files with 1847 additions and 1009 deletions
--- a/gui/builtinStatsViews/targetingMiscViewFull.py
+++ b/gui/builtinStatsViews/targetingMiscViewFull.py
@@ -26,7 +26,7 @@ import locale
 try:
    from collections import OrderedDict
 except ImportError:
-    from gui.utils.compat import OrderedDict
+    from utils.compat import OrderedDict

 class TargetingMiscViewFull(StatsView):
    name = "targetingmiscViewFull"