Merge branch 'master' into wx3

2015-08-27 22:05:38 -04:00
parent e7542fec44 6dbed1403a
commit b162927f79
35 changed files with 199 additions and 34 deletions
--- a/config.py
+++ b/config.py
@@ -18,10 +18,10 @@ debug = False
 saveInRoot = False

 # Version data
-version = "1.13.3"
-tag = "git"
-expansionName = "Aegis"
-expansionVersion = "1.0"
+version = "1.14.0"
+tag = "Stable"
+expansionName = "Galatea"
+expansionVersion = "1.2"
 evemonMinVersion = "4081"

 pyfaPath = None