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

Merge branch 'departure-boards-sx' into jgrpp

Browse Source 
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/window_type.h
This commit is contained in:
Jonathan G Rennison
2015-08-02 18:23:25 +01:00
parent 6596ba216c 6c81f8f35b
commit 6452b0fe02
34 changed files with 2471 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
projects/openttd_vs80.vcproj
View File

@@ -510,6 +510,10 @@
RelativePath=".\..\src\dedicated.cpp"
>
</File>
<File
RelativePath=".\..\src\departures.cpp"
>
</File>
<File
RelativePath=".\..\src\depot.cpp"
>
@@ -1010,6 +1014,18 @@
RelativePath=".\..\src\video\dedicated_v.h"
>
</File>
<File
RelativePath=".\..\src\departures_func.h"
>
</File>
<File
RelativePath=".\..\src\departures_gui.h"
>
</File>
<File
RelativePath=".\..\src\departures_type.h"
>
</File>
<File
RelativePath=".\..\src\depot_base.h"
>
@@ -2090,6 +2106,10 @@
RelativePath=".\..\src\date_gui.cpp"
>
</File>
<File
RelativePath=".\..\src\departures_gui.cpp"
>
</File>
<File
RelativePath=".\..\src\depot_gui.cpp"
>

20
projects/openttd_vs90.vcproj
View File

@@ -507,6 +507,10 @@
RelativePath=".\..\src\dedicated.cpp"
>
</File>
<File
RelativePath=".\..\src\departures.cpp"
>
</File>
<File
RelativePath=".\..\src\depot.cpp"
>
@@ -1007,6 +1011,18 @@
RelativePath=".\..\src\video\dedicated_v.h"
>
</File>
<File
RelativePath=".\..\src\departures_func.h"
>
</File>
<File
RelativePath=".\..\src\departures_gui.h"
>
</File>
<File
RelativePath=".\..\src\departures_type.h"
>
</File>
<File
RelativePath=".\..\src\depot_base.h"
>
@@ -2087,6 +2103,10 @@
RelativePath=".\..\src\date_gui.cpp"
>
</File>
<File
RelativePath=".\..\src\departures_gui.cpp"
>
</File>
<File
RelativePath=".\..\src\depot_gui.cpp"
>