Jonathan G Rennison
4c5173b6bf
Merge branch 'auto_timetables-sx' into jgrpp
# Conflicts:
# src/lang/english.txt
# src/saveload/afterload.cpp
# src/saveload/extended_ver_sl.cpp
# src/settings_gui.cpp
# src/settings_type.h
# src/table/company_settings.ini
# src/vehicle.cpp
2016-05-08 01:13:35 +01:00
..
2016-05-08 01:13:35 +01:00
2014-04-24 04:41:54 +00:00
2014-04-23 20:13:33 +00:00
2014-04-23 20:13:33 +00:00
2014-04-23 20:13:33 +00:00
2014-04-23 20:13:33 +00:00
2014-04-23 20:13:33 +00:00
2014-04-23 20:13:33 +00:00
2016-05-08 01:13:35 +01:00
2014-04-23 20:13:33 +00:00
2014-04-23 20:13:33 +00:00
2015-04-23 20:07:07 +00:00
2016-05-08 01:13:35 +01:00
2016-04-08 20:38:31 +01:00
2014-10-12 18:41:53 +00:00
2014-04-23 20:13:33 +00:00
2014-05-17 17:18:07 +00:00
2014-04-23 20:13:33 +00:00
2015-05-21 18:59:11 +00:00
2014-04-23 20:13:33 +00:00
2016-01-29 00:26:47 +00:00
2015-09-12 13:33:35 +01:00
2015-08-09 13:50:06 +01:00
2015-05-09 10:04:50 +00:00
2014-04-23 20:13:33 +00:00
2014-09-21 11:23:33 +00:00
2014-04-23 20:13:33 +00:00
2011-12-19 17:48:04 +00:00
2015-08-26 23:26:18 +01:00
2015-08-05 21:24:30 +01:00
2016-02-16 21:08:21 +00:00
2016-03-02 21:44:58 +00:00
2016-02-14 17:40:39 +00:00
2015-08-16 16:57:24 +01:00
2014-04-23 20:13:33 +00:00
2015-08-18 23:08:34 +01:00
2014-04-23 20:13:33 +00:00
2014-04-23 20:13:33 +00:00
2014-04-25 15:40:32 +00:00
2014-04-23 20:13:33 +00:00
2016-02-13 19:26:47 +00:00
2016-03-21 21:18:22 +00:00
2015-08-09 18:31:00 +01:00
2015-09-02 20:51:30 +01:00
2016-02-02 23:09:29 +00:00
2014-04-23 20:13:33 +00:00