Merge branch 'template_train_replacement-sx' into jgrpp

# Conflicts: # src/build_vehicle_gui.cpp # src/saveload/afterload.cpp
2016-02-16 21:08:21 +00:00
parent b87957c9db f3e01f4c6d
commit 0779c7b7a9
25 changed files with 281 additions and 1037 deletions
--- a/source.list
+++ b/source.list
@@ -1,12 +1,10 @@
 # Source Files
 tbtr_template_gui_main.cpp
 tbtr_template_gui_create.cpp
-tbtr_template_gui_create_virtualtrain.cpp
 tbtr_template_vehicle.cpp
 tbtr_template_vehicle_func.cpp
 tbtr_template_gui_main.h
 tbtr_template_gui_create.h
-tbtr_template_gui_create_virtualtrain.h
 tbtr_template_vehicle.h
 tbtr_template_vehicle_func.h