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

Merge branch 'template_train_replacement-sx' into jgrpp

Browse Source 
# Conflicts:
#	src/build_vehicle_gui.cpp
#	src/saveload/afterload.cpp
This commit is contained in:
Jonathan G Rennison
2016-02-16 21:08:21 +00:00
parent b87957c9db f3e01f4c6d
commit 0779c7b7a9
25 changed files with 281 additions and 1037 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
projects/openttd_vs90.vcproj
View File

@@ -439,10 +439,6 @@
RelativePath=".\..\src\tbtr_template_gui_create.cpp"
>
</File>
<File
RelativePath=".\..\src\tbtr_template_gui_create_virtualtrain.cpp"
>
</File>
<File
RelativePath=".\..\src\tbtr_template_vehicle.cpp"
>
@@ -459,10 +455,6 @@
RelativePath=".\..\src\tbtr_template_gui_create.h"
>
</File>
<File
RelativePath=".\..\src\tbtr_template_gui_create_virtualtrain.h"
>
</File>
<File
RelativePath=".\..\src\tbtr_template_vehicle.h"
>