Jonathan G Rennison
ffef1c9e44
Merge branch 'master' into jgrpp-beta
# Conflicts:
# src/saveload/cargopacket_sl.cpp
# src/saveload/cheat_sl.cpp
# src/saveload/company_sl.cpp
# src/saveload/engine_sl.cpp
# src/saveload/map_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/saveload/station_sl.cpp
# src/saveload/vehicle_sl.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/stdafx.h
# src/table/settings/settings.ini
# src/town_cmd.cpp
# src/vehicle.cpp
2021-10-25 18:10:15 +01:00
..
2020-10-01 23:18:39 +01:00
2020-10-01 23:18:39 +01:00
2021-02-26 18:02:13 +00:00
2019-11-10 17:59:20 +00:00
2021-02-26 18:02:13 +00:00
2019-11-10 17:59:20 +00:00
2021-02-01 17:07:34 +00:00
2019-11-10 17:59:20 +00:00
2021-10-25 18:10:15 +01:00
2019-11-10 17:59:20 +00:00
2021-10-25 18:10:15 +01:00
2020-10-01 23:18:39 +01:00
2021-02-01 17:07:34 +00:00
2021-03-02 11:59:03 +00:00
2021-10-25 18:10:15 +01:00
2021-03-04 00:17:10 +00:00
2021-02-26 18:02:13 +00:00
2019-11-10 17:59:20 +00:00
2021-10-25 18:10:15 +01:00
2021-01-31 01:08:35 +00:00
2019-11-10 17:59:20 +00:00
2019-11-10 17:59:20 +00:00
2021-10-25 18:10:15 +01:00
2021-02-22 22:16:07 +01:00
2019-11-10 17:59:20 +00:00
2019-11-10 17:59:20 +00:00
2021-03-04 00:17:10 +00:00
2021-03-02 11:59:03 +00:00
2021-10-25 18:10:15 +01:00
2021-02-22 22:16:07 +01:00
2021-05-27 18:30:56 +02:00
2021-05-15 10:16:48 +02:00
2019-11-10 17:59:20 +00:00
2020-10-01 23:18:39 +01:00