Merge branch 'master' into development

2017-02-25 19:01:28 -05:00
parent 6da806c9c5 1ae5f64696
commit 1d9b85c043
2 changed files with 2 additions and 2 deletions
--- a/config.py
+++ b/config.py
@@ -19,7 +19,7 @@ saveInRoot = False

 # Version data
 version = "1.27.2"
-tag = "git"
+tag = "Stable"
 expansionName = "YC119.2"
 expansionVersion = "1.4"
 evemonMinVersion = "4081"
--- a/gui/bitmapLoader.py
+++ b/gui/bitmapLoader.py
@@ -34,7 +34,7 @@ except ImportError:

 class BitmapLoader(object):
    try:
-        archive = zipfile.ZipFile(os.path.join(config.pyfaPath, 'imgs.zip', 'r'))
+        archive = zipfile.ZipFile(os.path.join(config.pyfaPath, 'imgs.zip'), 'r')
    except IOError:
        archive = None