merge for v2.2.1

ArtificialQualia · Sep 3, 2018 · abcc356 · abcc356
2 parents a4ad628 + bf81026
commit abcc356
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -105,4 +105,4 @@ ENV/
 
 /.project
 /.pydevproject
-/.settings
+.settings/org.eclipse.core.resources.prefs
diff --git a/setup-for-installer.spec b/setup-for-installer.spec
@@ -6,7 +6,7 @@ block_cipher = None
 a = Analysis(['PyEveLiveDPS\\peld.py'],
              pathex=['.\\PyEveLiveDPS'],
              binaries=[],
-             datas=[('app.ico', '.'), ('.\\PyEveLiveDPS\\images\\*.png', 'images')],
+             datas=[('app.ico', '.'), ('.\\PyEveLiveDPS\\images\\*.png', 'images'), ('.\\PyEveLiveDPS\\images\\*.gif', 'images')],
              hiddenimports=[],
              hookspath=[],
              runtime_hooks=[],

diff --git a/setup-standalone.spec b/setup-standalone.spec
@@ -6,7 +6,7 @@ block_cipher = None
 a = Analysis(['PyEveLiveDPS\\peld.py'],
              pathex=['.\\PyEveLiveDPS'],
              binaries=[],
-             datas=[('app.ico', '.'), ('.\\PyEveLiveDPS\\images\\*.png', 'images')],
+             datas=[('app.ico', '.'), ('.\\PyEveLiveDPS\\images\\*.png', 'images'), ('.\\PyEveLiveDPS\\images\\*.gif', 'images')],
              hiddenimports=[],
              hookspath=[],
              runtime_hooks=[],