Merge branch 'master' into cpp-11

This commit is contained in:
Jonathan G Rennison
2019-01-13 22:49:55 +00:00
143 changed files with 1012 additions and 320 deletions

View File

@@ -521,6 +521,7 @@
<ClInclude Include="..\src\group_gui.h" />
<ClInclude Include="..\src\group_type.h" />
<ClInclude Include="..\src\gui.h" />
<ClInclude Include="..\src\guitimer_func.h" />
<ClInclude Include="..\src\heightmap.h" />
<ClInclude Include="..\src\highscore.h" />
<ClInclude Include="..\src\hotkeys.h" />