summaryrefslogtreecommitdiff
path: root/src/.gitignore
diff options
context:
space:
mode:
authorSimon Howard2010-04-30 20:53:31 +0000
committerSimon Howard2010-04-30 20:53:31 +0000
commit1162b2c65c5bcff51e2d13aa2cfc2051529cfe68 (patch)
treef87e1751ec53be3322d6f0caf2ee6ab34132b7cc /src/.gitignore
parent63ff4879e6c7811d9e8cf357b4e44701964adf21 (diff)
parentf151517ba6b7e7caf7b49e8ceafbf0969959e068 (diff)
downloadchocolate-doom-1162b2c65c5bcff51e2d13aa2cfc2051529cfe68.tar.gz
chocolate-doom-1162b2c65c5bcff51e2d13aa2cfc2051529cfe68.tar.bz2
chocolate-doom-1162b2c65c5bcff51e2d13aa2cfc2051529cfe68.zip
Merge from trunk.
Subversion-branch: /branches/raven-branch Subversion-revision: 1924
Diffstat (limited to 'src/.gitignore')
-rw-r--r--src/.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/.gitignore b/src/.gitignore
index e560093f..aa8a4c05 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -7,7 +7,7 @@ chocolate-heretic
chocolate-hexen
chocolate-server
chocolate-setup
-doom-screensaver.desktop
*.exe
+*.desktop
tags
TAGS