Merge branch 'master' into wx3

Conflicts:
	gui/characterEditor.py
This commit is contained in:
blitzmann
2015-09-26 18:53:28 -04:00
105 changed files with 508 additions and 234 deletions

View File

@@ -18,8 +18,8 @@ debug = False
saveInRoot = False
# Version data
version = "1.14.0"
tag = "Stable"
version = "1.14.1"
tag = "git"
expansionName = "Galatea"
expansionVersion = "1.2"
evemonMinVersion = "4081"