commit 9524b0fabe99516b6bc45bd8b40223235921a6c7
Author:     Mike Swanson <mikeonthecomputer@gmail.com>
AuthorDate: Fri Aug 26 20:59:10 2016 -0700
Commit:     Mike Swanson <mikeonthecomputer@gmail.com>
CommitDate: Fri Aug 26 20:59:10 2016 -0700

    Ignore Emacs temp files and src/*.cfg src/*.txt

    The latter two are useful when running the Windows build of Chocolate
    Doom under src.  We don't want to accidentally commit generated config
    or stdout/stderr files.
---
 .gitignore     | 1 +
 src/.gitignore | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 57ab998c..9de6a07a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@ stamp-h
 stamp-h.in
 stamp-h1
 tags
+\#*\#

 # These are the default patterns globally ignored by Subversion:
 *.o
diff --git a/src/.gitignore b/src/.gitignore
index 84a9eaea..6986ecfe 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -12,8 +12,10 @@ chocolate-heretic-setup
 chocolate-hexen-setup
 chocolate-strife-setup
 chocolate-setup
+*.cfg
 *.exe
 *.desktop
+*.txt
 *.appdata.xml
 tags
 TAGS