Merge branch 'template_train_replacement' into jgrpp

# Conflicts:
#	src/economy.cpp
#	src/network/network_command.cpp
#	src/saveload/extended_ver_sl.cpp
This commit is contained in:
Jonathan G Rennison
2017-01-21 01:44:05 +00:00
11 changed files with 46 additions and 199 deletions

View File

@@ -130,7 +130,7 @@ CommandCallback CcStartStopVehicle;
/* tbtr_template_gui_create.cpp */
CommandCallback CcSetVirtualTrain;
CommandCallback CcVirtualTrainWaggonsMoved;
CommandCallback CcVirtualTrainWagonsMoved;
CommandCallback CcDeleteVirtualTrain;
/* build_vehicle_gui.cpp */