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-10-01 23:50:23 +01:00
2023-12-19 02:39:54 +00:00
2023-07-01 02:42:51 +01:00
2023-06-08 00:01:40 +01:00
2023-07-02 12:02:36 +01:00
2023-06-08 00:01:40 +01:00
2023-07-19 19:30:14 +02:00
2023-10-19 17:03:25 +01:00
2023-11-25 14:14:00 +00:00
2023-06-08 00:01:40 +01:00
2023-07-19 19:30:14 +02:00
2023-06-08 00:01:40 +01:00
2023-07-19 19:30:14 +02:00
2023-07-19 19:30:14 +02:00
2023-11-25 13:30:06 +00:00
2023-07-06 19:59:50 +02:00
2023-06-08 00:01:40 +01:00
2023-06-08 00:01:40 +01:00
2023-11-19 13:00:21 +00:00
2023-09-11 08:55:12 +00:00
2023-06-08 00:01:40 +01:00
2023-11-25 16:32:21 +00:00
2023-08-15 18:12:05 +02:00
2023-12-19 02:39:54 +00:00
2023-07-03 22:42:59 +01:00
2023-07-19 19:30:14 +02:00
2023-06-08 00:01:40 +01:00
2023-12-23 13:26:55 +00:00
2023-12-23 13:26:55 +00:00
2023-12-23 13:26:55 +00:00
2023-11-18 20:00:55 +00:00
2023-06-08 00:01:40 +01:00
2023-11-25 13:30:06 +00:00
2023-06-08 00:01:40 +01:00
2023-07-19 19:30:14 +02:00
2023-06-08 00:01:40 +01:00
2023-11-25 13:30:06 +00:00
2023-12-17 23:00:46 +00:00