Jonathan G Rennison
c929f7075e
Merge branch 'master' into jgrpp
# Conflicts:
# cmake/SourceList.cmake
# src/build_vehicle_gui.cpp
# src/company_gui.cpp
# src/console_cmds.cpp
# src/depot_base.h
# src/elrail.cpp
# src/network/core/udp.cpp
# src/network/network_admin.cpp
# src/network/network_chat_gui.cpp
# src/network/network_gui.cpp
# src/network/network_server.cpp
# src/newgrf.cpp
# src/newgrf_engine.cpp
# src/newgrf_railtype.cpp
# src/newgrf_railtype.h
# src/newgrf_storage.h
# src/os/unix/crashlog_unix.cpp
# src/rail.h
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/road_cmd.cpp
# src/road_map.h
# src/saveload/labelmaps_sl.cpp
# src/settings_gui.cpp
# src/settings_type.h
# src/sl/oldloader_sl.cpp
# src/station_cmd.cpp
# src/station_gui.cpp
# src/table/settings/world_settings.ini
# src/tests/test_script_admin.cpp
# src/textfile_gui.cpp
# src/toolbar_gui.cpp
# src/train_cmd.cpp
# src/tunnelbridge_cmd.cpp
# src/vehicle_gui.cpp
# src/widget.cpp
# src/window.cpp
# src/window_gui.h
# src/window_type.h
2023-11-19 13:00:21 +00:00
..
2021-01-22 10:26:45 +01:00
2020-06-27 18:21:17 +02:00
2021-04-24 13:19:13 +02:00
2019-10-20 17:41:17 +01:00
2023-09-11 18:55:23 +00:00
2019-10-20 17:12:54 +01:00
2023-08-15 22:21:13 +02:00
2021-08-22 14:27:48 +02:00
2010-11-20 12:11:11 +00:00
2010-11-20 12:11:11 +00:00
2006-03-29 16:30:26 +00:00
2021-07-20 19:57:23 +02:00
2023-09-03 20:58:25 +01:00
2010-08-27 10:42:48 +00:00
2023-09-30 12:39:09 +01:00
2023-09-30 12:39:09 +01:00
2019-10-20 17:12:54 +01:00
2020-01-26 13:45:51 +01:00
2023-09-11 18:55:23 +00:00
2023-08-26 15:01:10 +01:00
2023-08-26 15:01:10 +01:00
2022-12-12 23:19:44 +00:00
2022-12-12 23:19:44 +00:00
2023-04-02 13:11:11 +01:00
2023-10-23 22:49:07 +01:00
2023-04-13 21:19:53 +01:00
2023-04-13 21:19:53 +01:00
2011-10-04 21:35:47 +00:00
2018-06-05 22:58:35 +02:00
2009-10-22 16:01:28 +00:00
2023-08-12 22:01:22 +02:00
2010-11-20 12:11:11 +00:00
2023-03-26 11:08:37 +02:00
2021-07-10 18:38:28 +02:00
2023-05-23 22:21:19 +01:00
2023-08-30 18:27:15 +00:00
2010-11-20 12:11:11 +00:00
