Merge branch 'Optimize'

[andy/viking.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 31723849bd6c74540d6bb3a3f46552aeac9ad0c5..9a7322c2d68099abf10e94df6f7ea79400696063 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -107,3 +107,15 @@ help/C/*html
 /po/POTFILES
 /po/.intltool-merge-cache
 /po/stamp-it
+
+# win32/
+win32/Makefile
+win32/Makefile.in
+win32/installer/Makefile
+win32/installer/Makefile.in
+win32/installer/pixmaps/Makefile
+win32/installer/pixmaps/Makefile.in
+win32/installer/pixmaps/*o
+win32/installer/translations/Makefile
+win32/installer/translations/Makefile.in
+win32/installer/viking*.exe