Ignore windows executables and stack dumps.

2009-10-21 12:47:50 -04:00
parent d89c2206c4
commit b2dda51f57
3 changed files with 7 additions and 4 deletions
--- a/example/.gitignore
+++ b/example/.gitignore
@@ -1,3 +1,5 @@
+/*.exe
+/*.exe.stackdump
 /*.o
 /*~
 /.deps
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1,6 +1,9 @@
+/*.exe
+/*.exe.stackdump
 /*.o
 /*.orig
 /*.rej
+/*~
 /.deps
 /.libs
 /Makefile
@@ -9,7 +12,6 @@
 /cd-drive.1
 /cd-info
 /cd-info.1
-/*~
 /cd-read
 /cd-read.1
 /cdda-player
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -1,8 +1,7 @@
+/*.exe
+/*.exe.stackdump
 /*.o
-<<<<<<< HEAD:test/.gitignore
-=======
 /*~
->>>>>>> 4f0228e99f37dedd16bc56df7b3982b589cf4122:test/.gitignore
 /.deps
 /.libs
 /Makefile