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

Merge branch 'cpp-11' into signal_tunnels_bridges

Browse Source 
# Conflicts:
#	src/saveload/saveload.cpp
This commit is contained in:
Jonathan G Rennison
2016-09-11 13:16:54 +01:00
parent 22f9e3b97c ea2b04a6be
commit 888cd1be07
194 changed files with 9855 additions and 2966 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
projects/openttd_vs100.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>