Merge remote-tracking branch 'upstream/master'

[16.git] / .gitignore

diff --git a/.gitignore b/.gitignore
old mode 100644 (file)
new mode 100755 (executable)
index c06e067..61aa5c7
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,34 @@
-# Lines starting with '#' are considered comments.
-# Ignore (generated) html files,
-*.html
-*.htm
-*.sh
-!proj16.bfproject
-*.obj
-*.OBJ
-*.*~
-boop.sh
-
-# except foo.html which is maintained by hand.
-#!foo.html
-# Ignore objects and archives.
-*.[oa]
+# Lines starting with '#' are considered comments.\r
+# Ignore (generated) html files,\r
+*.html\r
+*.htm\r
+!proj16.bfproject\r
+*.obj\r
+*.OBJ\r
+*.[O]\r
+*.BCO\r
+*.*~\r
+FUCK\r
+*.err\r
+*.ERR\r
+*.lib\r
+*.LIB\r
+makefile~\r
+README~\r
+TODO~\r
+LICENCE~\r
+*.mah\r
+*.MAH\r
+!modex.lib\r
+img\r
+!.git/config\r
+!.gitmodules\r
+# except foo.html which is maintained by hand.\r
+#!foo.html\r
+# Ignore objects and archives.\r
+*.[oa]\r
+cute.vrl\r
+cute.pal\r
+dl_vga.lib\r
+dl_cpu.lib\r
+dl_dos.lib\r