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

.gitignore

@@ -55,7 +55,9 @@ $RECYCLE.BIN/
 *.blend
 *.blend1
 
+# breakpad symlink / directory
 /google-breakpad
+/google-breakpad/
 
 # convert_faction_xml2html
 /html/

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*/

source/.gitignore

@@ -1 +1,2 @@
 /windows_deps*/
+/glest_game/facilities/gitversion.h