Jonathan G Rennison
2a31095118
Merge branch 'master' into jgrpp
# Conflicts:
# regression/regression/result.txt
# src/aircraft_cmd.cpp
# src/airport_gui.cpp
# src/articulated_vehicles.cpp
# src/console_cmds.cpp
# src/date_gui.cpp
# src/engine.cpp
# src/genworld_gui.cpp
# src/gfx_layout_fallback.cpp
# src/group_gui.cpp
# src/hotkeys.cpp
# src/network/core/tcp_connect.cpp
# src/network/core/tcp_listen.h
# src/newgrf.cpp
# src/newgrf.h
# src/newgrf_engine.cpp
# src/newgrf_gui.cpp
# src/newgrf_station.cpp
# src/openttd.cpp
# src/order_gui.cpp
# src/os/macosx/osx_main.cpp
# src/pathfinder/yapf/yapf_node_rail.hpp
# src/rail_gui.cpp
# src/saveload/afterload.cpp
# src/saveload/cargopacket_sl.cpp
# src/saveload/linkgraph_sl.cpp
# src/saveload/station_sl.cpp
# src/script/api/script_industrytype.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_table.cpp
# src/settingsgen/settingsgen.cpp
# src/station.cpp
# src/station_cmd.cpp
# src/strings.cpp
# src/timer/timer_game_calendar.cpp
# src/timer/timer_game_calendar.h
# src/timer/timer_manager.h
# src/timer/timer_window.cpp
# src/timetable_cmd.cpp
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/town_gui.cpp
# src/train_gui.cpp
# src/vehicle_cmd.h
# src/vehicle_gui.cpp
# src/viewport.cpp
# src/widgets/dropdown.cpp
# src/window_func.h
# src/window_gui.h
2023-11-25 13:30:06 +00:00
..
2023-05-14 23:22:02 +02:00
2023-09-17 19:44:20 +02:00
2023-05-31 23:50:09 +01:00
2023-11-19 13:00:21 +00:00
2023-09-12 19:04:03 +01:00
2023-07-19 19:30:14 +02:00
2023-11-20 22:27:05 +00:00
2023-11-25 13:30:06 +00:00
2023-09-20 22:35:32 +02:00
2023-06-06 19:31:59 +01:00
2023-09-13 16:11:08 +02:00
2023-09-13 16:11:08 +02:00
2023-11-19 13:00:21 +00:00
2023-05-14 23:22:02 +02:00
2023-05-14 23:22:02 +02:00
2023-09-20 22:35:32 +02:00
2023-11-14 00:18:47 +00:00
2023-11-20 22:27:05 +00:00
2023-11-20 22:27:05 +00:00
2023-09-20 22:35:32 +02:00
2023-11-20 22:27:05 +00:00
2023-05-17 10:14:41 +01:00
2023-10-20 23:05:43 +02:00
2023-11-20 22:27:05 +00:00
2023-08-25 16:04:40 +02:00
2023-06-04 16:54:48 +01:00