Merge branch 'master' of github-softcoder-megaglest:MegaGlest/megaglest-source

2014-01-30 17:45:51 -08:00 · 2014-01-30 17:45:51 -08:00 · 51f4b6d0db
parent c5a938e31b 7dd40cd1be
commit 51f4b6d0db
3 changed files with 6 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -55,7 +55,9 @@ $RECYCLE.BIN/
 *.blend
 *.blend1

+# breakpad symlink / directory
 /google-breakpad
+/google-breakpad/

 # convert_faction_xml2html
 /html/
--- a/mk/windoze/.gitignore
+++ b/mk/windoze/.gitignore
@ -17,7 +17,10 @@
 /game_util.cpp
 /glestkeys.ini
 /servers.ini
+# Files generated during build
 /xml_test_malformed.xml
+/vc2012/x64/
+/vc2012/xml_test_malformed.xml

 # Coverity
 /cov-analysis*/
--- a/source/.gitignore
+++ b/source/.gitignore
@ -1 +1,2 @@
 /windows_deps*/
+/glest_game/facilities/gitversion.h