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/src/command_func.h
+++ b/src/command_func.h
@@ -133,7 +133,7 @@ CommandCallback CcSetVirtualTrain;
 CommandCallback CcVirtualTrainWaggonsMoved;
 CommandCallback CcDeleteVirtualTrain;

-/* tbtr_template_gui_create_virtualtrain.cpp */
+/* build_vehicle_gui.cpp */
 CommandCallback CcAddVirtualEngine;

 #endif /* COMMAND_FUNC_H */