From 4626c89fde4187298219d76253415b58347b199c Mon Sep 17 00:00:00 2001
From: dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Tue, 28 Jul 2009 13:02:24 +0000
Subject: 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
---
 .gitignore           | 29 -----------------------------
 crawl-ref/.gitignore | 30 ++++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 29 deletions(-)
 delete mode 100644 .gitignore
 create mode 100644 crawl-ref/.gitignore

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 64956ff1ae..0000000000
--- a/.gitignore
+++ /dev/null
@@ -1,29 +0,0 @@
-*.[oa]
-*.ann
-*.diff
-saves
-morgue
-*.orig
-*.rej
-*.swp
-core
-debug.map
-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
-
-# The Crawl executable.
-crawl-ref/source/crawl
-
-# Level-compiler generated files.
-crawl-ref/source/util/*.cc
-crawl-ref/source/util/*.h
diff --git a/crawl-ref/.gitignore b/crawl-ref/.gitignore
new file mode 100644
index 0000000000..5ee883acef
--- /dev/null
+++ b/crawl-ref/.gitignore
@@ -0,0 +1,30 @@
+*.[oa]
+*.ann
+*.diff
+saves
+morgue
+*.orig
+*.rej
+*.swp
+core
+debug.map
+err.txt
+map.dump
+mapgen.log
+\#*
+.#*
+TAGS
+
+arena.result
+
+# Tile copied files
+source/dat/tiles/dngn.png
+source/dat/tiles/main.png
+source/dat/tiles/player.png
+
+# The Crawl executable.
+source/crawl
+
+# Level-compiler generated files.
+source/util/*.cc
+source/util/*.h
-- 
cgit v1.2.3-54-g00ecf