summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2009-07-28 13:02:24 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2009-07-28 13:02:24 +0000
commit4626c89fde4187298219d76253415b58347b199c (patch)
treef8dec2af98cdbf6329b07ab5597cc03881a30adc
parent7da9fbce1aed84ac9b02d8c4f7363ca02429d238 (diff)
downloadcrawl-ref-4626c89fde4187298219d76253415b58347b199c.tar.gz
crawl-ref-4626c89fde4187298219d76253415b58347b199c.zip
Trunk->0.5 merge (10445): Move .gitignore into crawl-ref (RjY).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.5@10446 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/.gitignore (renamed from .gitignore)13
1 files changed, 7 insertions, 6 deletions
diff --git a/.gitignore b/crawl-ref/.gitignore
index 64956ff1ae..5ee883acef 100644
--- a/.gitignore
+++ b/crawl-ref/.gitignore
@@ -12,18 +12,19 @@ err.txt
map.dump
mapgen.log
\#*
+.#*
TAGS
arena.result
# Tile copied files
-crawl-ref/source/dat/tiles/dngn.png
-crawl-ref/source/dat/tiles/main.png
-crawl-ref/source/dat/tiles/player.png
+source/dat/tiles/dngn.png
+source/dat/tiles/main.png
+source/dat/tiles/player.png
# The Crawl executable.
-crawl-ref/source/crawl
+source/crawl
# Level-compiler generated files.
-crawl-ref/source/util/*.cc
-crawl-ref/source/util/*.h
+source/util/*.cc
+source/util/*.h