Merge remote-tracking branch 'origin/1.8-Rewrite' into 1.8-Rewrite

This commit is contained in:
Nick 2015-11-02 15:28:52 -08:00
commit c10c0455be

2
.gitignore vendored
View file

@ -33,4 +33,6 @@ crash-reports/
Thumbs.db
usernamecache.json
options.txt
BloodMagic_Client.launch
BloodMagic_Server.launch