Merge branch 'master' into wx3

2015-09-29 21:35:44 -04:00
parent a3b108382e 4e890e1e1d
commit 072fac4259
29 changed files with 124 additions and 51 deletions
--- a/config.py
+++ b/config.py
@@ -18,10 +18,10 @@ debug = False
 saveInRoot = False

 # Version data
-version = "1.14.1"
-tag = "git"
-expansionName = "Galatea"
-expansionVersion = "1.2"
+version = "1.15.0"
+tag = "Stable"
+expansionName = "Vanguard"
+expansionVersion = "1.0"
 evemonMinVersion = "4081"

 pyfaPath = None