Merge branch 'Optimize'

[andy/viking.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 8a9ce325ac674e61dde7b2444a7f98e6daa00d7f..9a7322c2d68099abf10e94df6f7ea79400696063 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -109,5 +109,13 @@ help/C/*html
 /po/stamp-it
 
 # win32/
 /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/pixmaps/*o

+win32/installer/translations/Makefile
+win32/installer/translations/Makefile.in

 win32/installer/viking*.exe
 win32/installer/viking*.exe