Merge branch 'master' into cpp-11

2019-01-13 22:49:55 +00:00
parent 962a9c5430 823c5bfa3b
commit 0bed63b77f
143 changed files with 1012 additions and 320 deletions
--- a/projects/openttd_vs140.vcxproj
+++ b/projects/openttd_vs140.vcxproj
@@ -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" />
--- a/projects/openttd_vs140.vcxproj.filters
+++ b/projects/openttd_vs140.vcxproj.filters
@@ -651,6 +651,9 @@
    <ClInclude Include="..\src\gui.h">
      <Filter>Header Files</Filter>
    </ClInclude>
+    <ClInclude Include="..\src\guitimer_func.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
    <ClInclude Include="..\src\heightmap.h">
      <Filter>Header Files</Filter>
    </ClInclude>
--- a/projects/openttd_vs141.vcxproj
+++ b/projects/openttd_vs141.vcxproj
@@ -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" />
--- a/projects/openttd_vs141.vcxproj.filters
+++ b/projects/openttd_vs141.vcxproj.filters
@@ -651,6 +651,9 @@
    <ClInclude Include="..\src\gui.h">
      <Filter>Header Files</Filter>
    </ClInclude>
+    <ClInclude Include="..\src\guitimer_func.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
    <ClInclude Include="..\src\heightmap.h">
      <Filter>Header Files</Filter>
    </ClInclude>