Jonathan G Rennison
d5a7a67b8c
Merge branch 'master' into jgrpp
# Conflicts:
# .github/workflows/ci-build.yml
# src/ai/ai_gui.cpp
# src/blitter/32bpp_optimized.cpp
# src/blitter/32bpp_simple.cpp
# src/blitter/32bpp_sse2.cpp
# src/blitter/8bpp_optimized.cpp
# src/blitter/8bpp_simple.cpp
# src/blitter/null.cpp
# src/blitter/null.hpp
# src/company_gui.cpp
# src/game/game_gui.cpp
# src/genworld_gui.cpp
# src/gfx.cpp
# src/gfx_func.h
# src/graph_gui.cpp
# src/industry_gui.cpp
# src/linkgraph/linkgraphjob.cpp
# src/network/network_gui.cpp
# src/newgrf_debug_gui.cpp
# src/openttd.cpp
# src/pathfinder/npf/aystar.h
# src/road_gui.cpp
# src/saveload/order_sl.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/script/api/script_log.cpp
# src/script/api/script_town.cpp
# src/script/script_gui.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_table.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/sortlist_type.h
# src/spritecache.cpp
# src/spriteloader/grf.cpp
# src/spriteloader/grf.hpp
# src/spriteloader/spriteloader.hpp
# src/station_cmd.cpp
# src/station_cmd.h
# src/station_gui.cpp
# src/strings.cpp
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/town_gui.cpp
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
# src/video/opengl.cpp
# src/video/opengl.h
# src/widgets/dropdown.cpp
# src/widgets/dropdown_type.h
# src/window_gui.h
2023-12-23 13:26:55 +00:00
..
2023-12-23 13:26:55 +00:00
2020-09-25 14:43:13 +01:00
2023-08-19 10:18:31 +01:00
2023-08-19 10:18:31 +01:00
2023-12-13 18:01:54 +00:00
2023-11-20 22:27:05 +00:00
2023-12-04 16:41:02 +00:00
2023-12-05 15:37:53 +01:00
2020-09-25 14:43:13 +01:00
2021-02-07 12:54:02 +01:00
2023-02-20 21:11:55 +00:00
2020-06-28 21:57:02 +01:00
2020-07-01 00:25:50 +01:00
2020-06-28 21:57:02 +01:00
2023-02-20 23:42:55 +00:00
2020-09-25 14:43:13 +01:00
2020-09-25 14:43:13 +01:00
2020-09-25 14:43:13 +01:00
2023-11-26 15:59:41 +00:00
2023-05-01 22:17:56 +02:00
2020-06-30 09:43:00 +01:00
2023-05-01 22:17:56 +02:00
2023-08-20 17:16:08 +02:00
2020-06-28 21:57:02 +01:00
2021-02-08 23:23:24 +00:00
2020-06-28 21:57:02 +01:00
2020-06-28 21:57:02 +01:00
2023-08-14 00:20:04 +01:00
2020-09-25 14:43:13 +01:00
2020-06-28 21:57:02 +01:00
2020-11-26 19:06:03 +00:00
2021-03-01 18:08:28 +00:00
2023-12-17 00:37:16 +00:00
2023-12-13 18:01:54 +00:00
2022-10-03 20:32:26 +01:00
2023-05-14 23:22:02 +02:00
2020-12-19 18:26:29 +01:00
2021-03-13 12:00:40 +00:00
2020-06-05 19:36:05 +02:00
2022-04-19 02:11:42 +02:00
2023-12-13 18:01:54 +00:00
2020-09-25 14:43:13 +01:00