You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Jonathan G Rennison 88670a230f Merge branch 'master' into jgrpp ... # Conflicts: # src/articulated_vehicles.cpp # src/articulated_vehicles.h # src/base_media_base.h # src/base_media_func.h # src/build_vehicle_gui.cpp # src/dock_gui.cpp # src/main_gui.cpp # src/music_gui.cpp # src/network/network_chat_gui.cpp # src/network/network_content.cpp # src/newgrf.cpp # src/newgrf_roadstop.cpp # src/os/windows/string_uniscribe.h # src/os/windows/win32.cpp # src/rail_gui.cpp # src/road.cpp # src/road_gui.cpp # src/settings.cpp # src/settings_gui.cpp # src/smallmap_gui.cpp # src/strings.cpp # src/terraform_gui.cpp # src/tests/test_script_admin.cpp # src/tests/test_window_desc.cpp # src/timer/timer_game_calendar.h # src/vehicle.cpp # src/vehicle_base.h # src/viewport.cpp # src/widget_type.h # src/window.cpp # src/window_gui.h		7 months ago
..
ci-build.yml	Merge branch 'master' into jgrpp	7 months ago
codeql.yml	Merge branch 'master' into jgrpp	7 months ago
preview-build.yml	Codechange: vendor the nlohmann-json library (#11290)	7 months ago
preview.yml	Fix: [CI] preview for one PR could cancel the preview of another (#11121)	12 months ago
release-docs.yml	Github: Change release workflows to match upstream	1 year ago
release-linux-distros.yml	Release: Remove ubuntu 18.04, debian buster. Add debian bookworm	10 months ago
release-linux.yml	Merge branch 'master' into jgrpp	7 months ago
release-macos.yml	Codechange: vendor the nlohmann-json library (#11290)	7 months ago
release-source.yml	Merge branch 'master' into jgrpp	7 months ago
release-windows.yml	Codechange: vendor the nlohmann-json library (#11290)	7 months ago
release.yml	Change: [CI] upload releases to new CDN (#11093)	12 months ago
script-missing-mode-enforcement.yml	Add: workflow and script for checking missing mode enforcements	1 year ago
unused-strings.yml	Merge branch 'master' into jgrpp	1 year ago