From fdb98bf34a610322f2a82037b71a2ea68936da80 Mon Sep 17 00:00:00 2001
From: Celtic Minstrel <celtic.minstrel.ca@some.place>
Date: Sun, 28 Dec 2014 12:22:24 -0500
Subject: [PATCH] Merge the two main git ignore files

---
 .gitignore          | 14 ++++++++++++++
 src/.gitignore      |  9 ---------
 src/doxy/.gitignore |  2 --
 3 files changed, 14 insertions(+), 11 deletions(-)
 delete mode 100644 src/.gitignore
 delete mode 100644 src/doxy/.gitignore

diff --git a/.gitignore b/.gitignore
index 619ef3d8..b35e1969 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,17 @@ Win32/*/obj
 *blades.ini
 
 .config.vars
+
+# XCode Junk Files
+src/*.xcodeproj/xcuserdata
+src/*.xcodeproj/*.xcworkspace/xcuserdata
+src/*.xcodeproj/*.mode*
+src/*.xcodeproj/*.pbxuser
+
+# Shader Builder projects
+# It's an sqlite3 database and not particularly important, so exclude it
+src/tools/*.sbproj
+
+# Doxygen stuff
+src/doxy/html/
+src/doxy/doxy_warnings.txt
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index b732f5af..00000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-# XCode Junk Files
-*.xcodeproj/xcuserdata
-*.xcodeproj/*.xcworkspace/xcuserdata
-*.xcodeproj/*.mode*
-*.xcodeproj/*.pbxuser
-
-# Shader Builder projects
-# It's an sqlite3 database and not particularly important, so exclude it
-*.sbproj
\ No newline at end of file
diff --git a/src/doxy/.gitignore b/src/doxy/.gitignore
deleted file mode 100644
index f683d49c..00000000
--- a/src/doxy/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-html/
-doxy-warnings.txt
\ No newline at end of file