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
..
2022-12-30 00:14:40 +00:00
2022-01-21 23:34:39 +00:00
2023-12-04 16:41:02 +00:00
2023-12-04 16:41:02 +00:00
2022-01-26 21:46:36 +00:00
2023-12-17 23:00:46 +00:00
2022-12-30 00:14:40 +00:00
2020-10-28 00:27:48 +00:00
2022-01-21 23:34:39 +00:00
2020-06-05 19:36:05 +02:00
2020-06-05 19:36:05 +02:00
2023-11-26 23:54:10 +01:00
2023-11-26 23:54:10 +01:00
2020-06-05 19:36:05 +02:00
2020-06-05 19:36:05 +02:00
2020-06-05 19:36:05 +02:00
2020-12-15 22:47:57 +01:00
2020-06-05 19:36:05 +02:00
2023-11-27 13:00:20 +00:00
2023-11-26 23:54:10 +01:00
2020-12-15 22:47:57 +01:00
2020-06-05 19:36:05 +02:00
2020-06-05 19:36:05 +02:00
2020-06-05 19:36:05 +02:00
2020-06-28 21:57:02 +01:00
2022-01-26 21:46:36 +00:00
2020-06-28 21:57:02 +01:00
2023-07-08 19:12:39 +01:00