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 1e9fb74451 Merge branch 'master' into jgrpp ... # Conflicts: # .github/workflows/release-windows.yml # src/autoreplace_gui.cpp # src/cargotype.cpp # src/company_base.h # src/company_cmd.cpp # src/company_gui.cpp # src/currency.h # src/date_gui.cpp # src/dropdown.cpp # src/dropdown_func.h # src/dropdown_type.h # src/game/game_gui.cpp # src/genworld.cpp # src/genworld_gui.cpp # src/ground_vehicle.hpp # src/group_gui.cpp # src/house.h # src/industry_gui.cpp # src/network/network_client.cpp # src/network/network_server.cpp # src/network/network_type.h # src/newgrf_class_func.h # src/newgrf_house.cpp # src/newgrf_roadstop.h # src/openttd.cpp # src/order_gui.cpp # src/saveload/saveload.cpp # src/saveload/saveload.h # src/screenshot_gui.cpp # src/settings_gui.cpp # src/settings_type.h # src/slider.cpp # src/smallmap_gui.cpp # src/station_cmd.cpp # src/stdafx.h # src/survey.cpp # src/tile_map.h # src/town_cmd.cpp # src/town_gui.cpp # src/vehicle.cpp # src/vehicle_gui.cpp # src/vehicle_gui_base.h		3 weeks ago
..
ci-build.yml	Merge branch 'master' into jgrpp	2 months ago
ci-emscripten.yml	Merge branch 'master' into jgrpp	3 months ago
ci-linux.yml	Merge branch 'master' into jgrpp	3 months ago
ci-macos.yml	Merge branch 'master' into jgrpp	2 months ago
ci-mingw.yml	Merge branch 'master' into jgrpp	3 months ago
ci-nightly.yml	Merge branch 'master' into jgrpp	3 months ago
ci-windows.yml	Merge branch 'master' into jgrpp	3 months ago
codeql.yml	Merge branch 'master' into jgrpp	3 months ago
preview-build.yml	Upgrade: [CI] bump the actions group with 9 updates (#11881)	5 months ago
preview.yml	Codefix: allow preview label on PRs against release branches too (#12310)	3 months ago
release-docs.yml	Upgrade: [CI] bump the actions group with 9 updates (#11881)	5 months ago
release-linux-dedicated.yml	Workflow: Upgrade image and actions for linux-dedicated build	4 months ago
release-linux-distros.yml	Workflow: Update actions in Linux distros release	4 months ago
release-linux.yml	Codechange: [CI] use "cargo install --locked" to use pinned dependency versions (#12243)	3 months ago
release-macos.yml	Change: [CI] Always use latest stable Xcode (#12390)	3 months ago
release-source.yml	Merge branch 'master' into jgrpp	4 months ago
release-windows.yml	Merge branch 'master' into jgrpp	3 weeks ago
release.yml	Workflow: Remove linux-legacy release	4 months ago
script-missing-mode-enforcement.yml	Upgrade: [CI] bump the actions group with 9 updates (#11881)	5 months ago
unused-strings.yml	Merge branch 'master' into jgrpp	4 months ago