Merge remote-tracking branch 'upstream/master'

[16.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 57a7589a9f854243236e1c1150253dcb2408e495..aa3c9906a6f90b711312ea0625ce7f37d24dbe18 100755 (executable)
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,6 @@
 # Ignore (generated) html files,\r
 *.html\r
 *.htm\r
-*.sh\r
 !proj16.bfproject\r
 *.obj\r
 *.OBJ\r
@@ -18,15 +17,18 @@ makefile~
 README~\r
 TODO~\r
 LICENCE~\r
-!boop.sh\r
-!awoo.sh\r
-!lowcase.sh\r
-!wmakegnu.sh\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
+cute.vrl\r
+cute.pal\r
+dl_vga.lib\r
+dl_cpu.lib\r
+dl_dos.lib\r