Merge pull request #672 from d2phap/develop

v7.5.1.1

Author: d2phap

.gitignore

@@ -10,7 +10,6 @@
 
 [Dd]ebug/
 [Rr]elease/
-x64/
 build/
 [Bb]in/
 [Oo]bj/
@@ -154,23 +153,18 @@ Desktop.ini
 $RECYCLE.BIN/
 
 # Mac desktop service store files
-.DS_Store
-*.cache
-*.cache
-*.cache
-Source/ImageGlass/obj/Debug/DesignTimeResolveAssemblyReferences.cache
-Source/.vs/ImageGlass.sqlite
-*.cache
 *.cache
-*.sqlite
-.vs/VSWorkspaceState.json
-Setup/ImageGlass_4.0.4.15.exe
-Setup/ImageGlass_4.1.7.26.exe
-/Source/.vs/ImageGlass/v15/Server/sqlite3
 *.ide
-*.lock
 *.ide-shm
 *.ide-wal
-*.ide
+*.lock
+*.sqlite
+.DS_Store
+.vs/VSWorkspaceState.json
+/Source/.vs/ImageGlass/v15/Server/sqlite3
+Setup/*.zip
+Setup/AdvancedInstaller/x86/ImageGlass-x86-cache
+Setup/AdvancedInstaller/x64/ImageGlass-x64-cache
+Source/.vs/ImageGlass.sqlite
+Source/ImageGlass/obj/Debug/DesignTimeResolveAssemblyReferences.cache
 
-Setup/