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

Merge branch 'cpp-11' into enhanced_viewport_overlay

Browse Source 
# Conflicts:
#	src/rail_gui.cpp
#	src/saveload/saveload.cpp
#	src/smallmap_gui.cpp
This commit is contained in:
Jonathan G Rennison
2016-09-10 00:57:05 +01:00
parent c6d9a49a73 ea2b04a6be
commit c20cf31514
192 changed files with 9712 additions and 2916 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
projects/openttd_vs140.vcxproj.filters
View File

@@ -942,6 +942,9 @@
<ClInclude Include="..\src\safeguards.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\scope.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\screenshot.h">
<Filter>Header Files</Filter>
</ClInclude>