Merge branch 'auto_timetables-sx' into jgrpp

Conflicts:
	src/lang/english.txt
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/settings_gui.cpp
	src/vehicle.cpp
This commit is contained in:
Jonathan G Rennison
2015-08-04 22:08:59 +01:00
16 changed files with 431 additions and 1 deletions

View File

@@ -30,6 +30,7 @@ enum SlXvFeatureIndex {
XSLFI_SIG_TUNNEL_BRIDGE, ///< Signals on tunnels and bridges
XLSFI_IMPROVED_BREAKDOWNS, ///< Improved breakdowns patch
XSLFI_TT_WAIT_IN_DEPOT, ///< Timetabling waiting time in depot patch
XSLFI_AUTO_TIMETABLE, ///< Auto timetables and separation patch
XSLFI_SIZE, ///< Total count of features, including null feature
};