summaryrefslogtreecommitdiffstats
path: root/crawl-ref
diff options
context:
space:
mode:
authorDavid Lawrence Ramsey <dolorous@users.sourceforge.net>2009-09-29 23:00:31 -0500
committerDavid Lawrence Ramsey <dolorous@users.sourceforge.net>2009-09-29 23:00:31 -0500
commit8e8643721d81ef69b88b75ca726c2f0cee50557c (patch)
tree1fd93d9031f12bc043a3fae319932aaad06dd5ab /crawl-ref
parent9c3c901527ab5fa7da28fb2888cde44a48310d11 (diff)
parent1841fe746fad2ccd9d09e889d342d3336f3d6375 (diff)
downloadcrawl-ref-8e8643721d81ef69b88b75ca726c2f0cee50557c.tar.gz
crawl-ref-8e8643721d81ef69b88b75ca726c2f0cee50557c.zip
Merge branch 'master' of ssh://crawl-ref.git.sourceforge.net/gitroot/crawl-ref/crawl-ref
Diffstat (limited to 'crawl-ref')
-rw-r--r--crawl-ref/.gitignore6
1 files changed, 6 insertions, 0 deletions
diff --git a/crawl-ref/.gitignore b/crawl-ref/.gitignore
index 91a624e7be..394f9921e3 100644
--- a/crawl-ref/.gitignore
+++ b/crawl-ref/.gitignore
@@ -22,6 +22,7 @@ arena.result
source/dat/tiles/dngn.png
source/dat/tiles/main.png
source/dat/tiles/player.png
+source/dat/tiles/gui.png
# The Crawl executable.
source/crawl
@@ -30,6 +31,11 @@ source/crawl
source/util/*.cc
source/util/*.h
+# Generated by ./dolinks.sh
+WIZARD
+NORMAL
+dat
+
# Xcode cruft
source/build
*.pbxuser