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

Merge branch 'master' into save_ext

Browse Source 
# Conflicts:
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
This commit is contained in:
Jonathan G Rennison
2019-01-21 18:37:47 +00:00
parent 4a162c5502 9ce92521c1
commit 80d6f6c622
113 changed files with 1599 additions and 1012 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
projects/openttd_vs140.vcxproj
View File

@@ -1351,6 +1351,14 @@
<Project>{0f066b23-18df-4284-8265-f4a5e7e3b966}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="settingsgen_vs140.vcxproj">
<Project>{e9548de9-f089-49b7-93a6-30be2cc311c7}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="settings_vs140.vcxproj">
<Project>{0817f629-589e-4a3b-b81a-8647bc571e35}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="strgen_vs140.vcxproj">
<Project>{a133a442-bd0a-4ade-b117-ad7545e4bdd1}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>