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

1
projects/openttd_vs100.vcxproj
View File

@@ -678,6 +678,7 @@
<ClInclude Include="..\src\os\windows\win32.h" />
<ClInclude Include="..\src\music\win32_m.h" />
<ClInclude Include="..\src\sound\win32_s.h" />
<ClInclude Include="..\src\unit_conversion.h" />
<ClInclude Include="..\src\video\win32_v.h" />
<ClInclude Include="..\src\window_func.h" />
<ClInclude Include="..\src\window_gui.h" />

3
projects/openttd_vs100.vcxproj.filters
View File

@@ -1263,6 +1263,9 @@
<ClInclude Include="..\src\sound\win32_s.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\unit_conversion.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\video\win32_v.h">
<Filter>Header Files</Filter>
</ClInclude>

1
projects/openttd_vs140.vcxproj
View File

@@ -695,6 +695,7 @@
<ClInclude Include="..\src\os\windows\win32.h" />
<ClInclude Include="..\src\music\win32_m.h" />
<ClInclude Include="..\src\sound\win32_s.h" />
<ClInclude Include="..\src\unit_conversion.h" />
<ClInclude Include="..\src\video\win32_v.h" />
<ClInclude Include="..\src\window_func.h" />
<ClInclude Include="..\src\window_gui.h" />

3
projects/openttd_vs140.vcxproj.filters
View File

@@ -1263,6 +1263,9 @@
<ClInclude Include="..\src\sound\win32_s.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\unit_conversion.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\video\win32_v.h">
<Filter>Header Files</Filter>
</ClInclude>

4
projects/openttd_vs80.vcproj
View File

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

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"
>