Merge the two main git ignore files

2014-12-28 12:22:24 -05:00
parent af0ee110c6
commit fdb98bf34a
3 changed files with 14 additions and 11 deletions
--- a/src/.gitignore
+++ b/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
--- a/src/doxy/.gitignore
+++ b/src/doxy/.gitignore
@@ -1,2 +0,0 @@
-html/
-doxy-warnings.txt