Jonathan G Rennison e82ccad052 Merge branch 'signal_tunnels_bridges' into jgrpp ...

# Conflicts:
#	src/pbs.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/signal.cpp
#	src/table/settings.ini
#	src/train_cmd.cpp
#	src/tunnelbridge.h

2018-06-17 09:35:18 +01:00

53 KiB

Raw Blame History

View Raw