Merge remote-tracking branch 'upstream/master'

[16.git] / .gitignore

diff --git a/.gitignore b/.gitignore
old mode 100644 (file)
new mode 100755 (executable)
index 54a1f6d..7345f26
--- a/.gitignore
+++ b/.gitignore
@@ -2,19 +2,29 @@
 # Ignore (generated) html files,\r
 *.html\r
 *.htm\r
-*.sh\r
 !proj16.bfproject\r
 *.obj\r
 *.OBJ\r
+*.[O]\r
+*.BCO\r
 *.*~\r
 FUCK\r
 *.err\r
 *.ERR\r
-!boop.sh\r
+*.lib\r
+*.LIB\r
+makefile~\r
+README~\r
+TODO~\r
+LICENCE~\r
+*.map\r
+#*.MAP\r
+!modex.lib\r
 img\r
 !.git/config\r
-\r
+!.gitmodules\r
 # except foo.html which is maintained by hand.\r
 #!foo.html\r
 # Ignore objects and archives.\r
 *.[oa]\r
+\r