From b2dda51f573787817adc2b72831171e4e0fe1927 Mon Sep 17 00:00:00 2001
From: "R. Bernstein" <rocky@gnu.org>
Date: Wed, 21 Oct 2009 12:47:50 -0400
Subject: [PATCH] Ignore windows executables and stack dumps.

---
 example/.gitignore | 2 ++
 src/.gitignore     | 4 +++-
 test/.gitignore    | 5 ++---
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/example/.gitignore b/example/.gitignore
index 502cfeb4..28c2f32f 100644
--- a/example/.gitignore
+++ b/example/.gitignore
@@ -1,3 +1,5 @@
+/*.exe
+/*.exe.stackdump
 /*.o
 /*~
 /.deps
diff --git a/src/.gitignore b/src/.gitignore
index 3d54b2f2..8bf79443 100644
--- 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
diff --git a/test/.gitignore b/test/.gitignore
index 7f8e272c..2ebd0c6b 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -1,8 +1,7 @@
+/*.exe
+/*.exe.stackdump
 /*.o
-<<<<<<< HEAD:test/.gitignore
-=======
 /*~
->>>>>>> 4f0228e99f37dedd16bc56df7b3982b589cf4122:test/.gitignore
 /.deps
 /.libs
 /Makefile