mirror of
https://github.com/glest/glest-source.git
synced 2025-09-02 04:22:32 +02:00
Merge branch 'master' of github-softcoder-megaglest:MegaGlest/megaglest-source
This commit is contained in:
2
.gitignore
vendored
2
.gitignore
vendored
@@ -55,7 +55,9 @@ $RECYCLE.BIN/
|
|||||||
*.blend
|
*.blend
|
||||||
*.blend1
|
*.blend1
|
||||||
|
|
||||||
|
# breakpad symlink / directory
|
||||||
/google-breakpad
|
/google-breakpad
|
||||||
|
/google-breakpad/
|
||||||
|
|
||||||
# convert_faction_xml2html
|
# convert_faction_xml2html
|
||||||
/html/
|
/html/
|
||||||
|
3
mk/windoze/.gitignore
vendored
3
mk/windoze/.gitignore
vendored
@@ -17,7 +17,10 @@
|
|||||||
/game_util.cpp
|
/game_util.cpp
|
||||||
/glestkeys.ini
|
/glestkeys.ini
|
||||||
/servers.ini
|
/servers.ini
|
||||||
|
# Files generated during build
|
||||||
/xml_test_malformed.xml
|
/xml_test_malformed.xml
|
||||||
|
/vc2012/x64/
|
||||||
|
/vc2012/xml_test_malformed.xml
|
||||||
|
|
||||||
# Coverity
|
# Coverity
|
||||||
/cov-analysis*/
|
/cov-analysis*/
|
||||||
|
1
source/.gitignore
vendored
1
source/.gitignore
vendored
@@ -1 +1,2 @@
|
|||||||
/windows_deps*/
|
/windows_deps*/
|
||||||
|
/glest_game/facilities/gitversion.h
|
||||||
|
Reference in New Issue
Block a user