Merge branch 'development' into PreferencesPaneV2

2017-02-26 11:22:10 -08:00
parent fbf35edae2 1826122381
commit dc6cde86c9
16 changed files with 560 additions and 70 deletions
--- a/gui/statsPane.py
+++ b/gui/statsPane.py
@@ -40,6 +40,7 @@ class StatsPane(wx.Panel):
        "resistances",
        "recharge",
        "firepower",
+        "outgoingView",
        "capacitor",
        "targetingMisc",
        "price",