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

Merge branch 'tracerestrict-sx' into jgrpp

Browse Source 
# Conflicts:
#	src/lang/english.txt
#	src/saveload/extended_ver_sl.cpp
#	src/tracerestrict.cpp
#	src/tracerestrict.h
#	src/tracerestrict_gui.cpp
This commit is contained in:
Jonathan G Rennison
2016-06-30 20:25:22 +01:00
parent 929327ecaf 71aa4c75cb
commit 80e3af6bf5
14 changed files with 345 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
projects/openttd_vs90.vcproj
View File

@@ -1983,6 +1983,10 @@
RelativePath=".\..\src\sound\win32_s.h"
>
</File>
<File
RelativePath=".\..\src\unit_conversion.h"
>
</File>
<File
RelativePath=".\..\src\video\win32_v.h"
>