Merge the two main git ignore files

.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

src/.gitignore

@@ -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

src/doxy/.gitignore

@@ -1,2 +0,0 @@
-html/
-doxy-warnings.txt