Merge remote-tracking branch 'remotes/origin/master' into lwoexport

codereader · Jul 25, 2017 · c11f749 · c11f749
2 parents 41d6ad6 + 6080763
commit c11f749
Show file tree

Hide file tree

Showing 483 changed files with 21,333 additions and 81,968 deletions.
diff --git a/.gitignore b/.gitignore
@@ -45,3 +45,16 @@ testsuite.ilk
 tools/msvc2015/DarkRadiant.VC.db
 *.iobj
 *.ipdb
+
+# Mac OS X Stuff
+.DS_Store
+xcuserdata
+Makefile.in
+/config.h.in
+/configure
+/ltmain.sh
+/aclocal.m4
+/install/*.zip
+/tools/msvc/.vs
+/tools/msvc/DarkRadiant.VC.db
+/tools/innosetup/*.zip