Merge from Marshall

This commit is contained in:
Ben Lankamp
2020-06-14 15:06:07 +02:00
269 changed files with 3935 additions and 391 deletions
+4 -2
View File
@@ -2,5 +2,7 @@
# This .gitignore file was automatically created by Microsoft(R) Visual Studio.
################################################################################
/.vs
/out
/.vs/CnC_Remastered_Collection/config
/.vs/CnC_Remastered_Collection/v16/ipch/AutoPCH
/.vs/CnC_Remastered_Collection/v16
/out/build/x86-Debug