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/builtinStatsViews/init.py
+++ b/gui/builtinStatsViews/init.py
@@ -4,6 +4,7 @@ __all__ = [
    "rechargeViewFull",
    "firepowerViewFull",
    "capacitorViewFull",
+    "outgoingViewFull",
    "targetingMiscViewMinimal",
    "priceViewFull",
 ]