dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'jgrpp' into jgrpp-nrt

Browse Source 
# Conflicts:
#	.ottdrev-vc
#	README.md
#	jgrpp-changelog.md
This commit is contained in:
Jonathan G Rennison
2019-08-29 01:01:45 +01:00
parent f825d4695e df2c6d48a8
commit ba9d1a0390
17 changed files with 104 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
projects/openttd_vs140.vcxproj
View File

@@ -492,6 +492,7 @@
<ClInclude Include="..\src\date_gui.h" />
<ClInclude Include="..\src\date_type.h" />
<ClInclude Include="..\src\debug.h" />
<ClInclude Include="..\src\debug_settings.h" />
<ClInclude Include="..\src\video\dedicated_v.h" />
<ClInclude Include="..\src\departures_func.h" />
<ClInclude Include="..\src\departures_gui.h" />
@@ -754,6 +755,7 @@
<ClInclude Include="..\src\core\backup_type.hpp" />
<ClCompile Include="..\src\core\bitmath_func.cpp" />
<ClInclude Include="..\src\core\bitmath_func.hpp" />
<ClInclude Include="..\src\core\checksum_func.hpp" />
<ClInclude Include="..\src\core\container_func.hpp" />
<ClInclude Include="..\src\core\dyn_arena_alloc.hpp" />
<ClInclude Include="..\src\core\endian_func.hpp" />

6
projects/openttd_vs140.vcxproj.filters
View File

@@ -570,6 +570,9 @@
<ClInclude Include="..\src\debug.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\debug_settings.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\video\dedicated_v.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -1356,6 +1359,9 @@
<ClInclude Include="..\src\core\bitmath_func.hpp">
<Filter>Core Source Code</Filter>
</ClInclude>
<ClInclude Include="..\src\core\checksum_func.hpp">
<Filter>Core Source Code</Filter>
</ClInclude>
<ClInclude Include="..\src\core\container_func.hpp">
<Filter>Core Source Code</Filter>
</ClInclude>

2
projects/openttd_vs141.vcxproj
View File

@@ -492,6 +492,7 @@
<ClInclude Include="..\src\date_gui.h" />
<ClInclude Include="..\src\date_type.h" />
<ClInclude Include="..\src\debug.h" />
<ClInclude Include="..\src\debug_settings.h" />
<ClInclude Include="..\src\video\dedicated_v.h" />
<ClInclude Include="..\src\departures_func.h" />
<ClInclude Include="..\src\departures_gui.h" />
@@ -754,6 +755,7 @@
<ClInclude Include="..\src\core\backup_type.hpp" />
<ClCompile Include="..\src\core\bitmath_func.cpp" />
<ClInclude Include="..\src\core\bitmath_func.hpp" />
<ClInclude Include="..\src\core\checksum_func.hpp" />
<ClInclude Include="..\src\core\container_func.hpp" />
<ClInclude Include="..\src\core\dyn_arena_alloc.hpp" />
<ClInclude Include="..\src\core\endian_func.hpp" />

6
projects/openttd_vs141.vcxproj.filters
View File

@@ -570,6 +570,9 @@
<ClInclude Include="..\src\debug.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\debug_settings.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\video\dedicated_v.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -1356,6 +1359,9 @@
<ClInclude Include="..\src\core\bitmath_func.hpp">
<Filter>Core Source Code</Filter>
</ClInclude>
<ClInclude Include="..\src\core\checksum_func.hpp">
<Filter>Core Source Code</Filter>
</ClInclude>
<ClInclude Include="..\src\core\container_func.hpp">
<Filter>Core Source Code</Filter>
</ClInclude>

2
projects/openttd_vs142.vcxproj
View File

@@ -492,6 +492,7 @@
<ClInclude Include="..\src\date_gui.h" />
<ClInclude Include="..\src\date_type.h" />
<ClInclude Include="..\src\debug.h" />
<ClInclude Include="..\src\debug_settings.h" />
<ClInclude Include="..\src\video\dedicated_v.h" />
<ClInclude Include="..\src\departures_func.h" />
<ClInclude Include="..\src\departures_gui.h" />
@@ -754,6 +755,7 @@
<ClInclude Include="..\src\core\backup_type.hpp" />
<ClCompile Include="..\src\core\bitmath_func.cpp" />
<ClInclude Include="..\src\core\bitmath_func.hpp" />
<ClInclude Include="..\src\core\checksum_func.hpp" />
<ClInclude Include="..\src\core\container_func.hpp" />
<ClInclude Include="..\src\core\dyn_arena_alloc.hpp" />
<ClInclude Include="..\src\core\endian_func.hpp" />

6
projects/openttd_vs142.vcxproj.filters
View File

@@ -570,6 +570,9 @@
<ClInclude Include="..\src\debug.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\debug_settings.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\video\dedicated_v.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -1356,6 +1359,9 @@
<ClInclude Include="..\src\core\bitmath_func.hpp">
<Filter>Core Source Code</Filter>
</ClInclude>
<ClInclude Include="..\src\core\checksum_func.hpp">
<Filter>Core Source Code</Filter>
</ClInclude>
<ClInclude Include="..\src\core\container_func.hpp">
<Filter>Core Source Code</Filter>
</ClInclude>