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 fe730bce31 Merge branch 'master' into jgrpp ... # Conflicts: # .github/workflows/ci-build.yml # .github/workflows/codeql.yml # .github/workflows/release-linux.yml # .github/workflows/release-macos.yml # .github/workflows/release-windows.yml # src/map.cpp # src/music/midifile.hpp # src/order_cmd.cpp # src/order_gui.cpp # src/pathfinder/yapf/yapf_rail.cpp # src/pbs.cpp # src/saveload/afterload.cpp # src/saveload/saveload.h # src/saveload/vehicle_sl.cpp # src/script/api/script_text.cpp # src/ship_cmd.cpp # src/train_cmd.cpp # src/vehicle.cpp # src/vehicle_base.h # src/vehicle_func.h # src/vehicle_gui.cpp # src/vehicle_gui_base.h # src/viewport.cpp # src/waypoint_cmd.cpp		3 months ago
..
ci-build.yml	Merge branch 'master' into jgrpp	3 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	3 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)	4 months ago
preview.yml	Fix: [CI] preview for one PR could cancel the preview of another (#11121)	11 months ago
release-docs.yml	Upgrade: [CI] bump the actions group with 9 updates (#11881)	4 months ago
release-linux-dedicated.yml	Workflow: Upgrade image and actions for linux-dedicated build	3 months ago
release-linux-distros.yml	Workflow: Update actions in Linux distros release	3 months ago
release-linux.yml	Codechange: [CI] use "cargo install --locked" to use pinned dependency versions (#12243)	3 months ago
release-macos.yml	Merge branch 'master' into jgrpp	3 months ago
release-source.yml	Merge branch 'master' into jgrpp	4 months ago
release-windows.yml	Merge branch 'master' into jgrpp	3 months ago
release.yml	Workflow: Remove linux-legacy release	3 months ago
script-missing-mode-enforcement.yml	Upgrade: [CI] bump the actions group with 9 updates (#11881)	4 months ago
unused-strings.yml	Merge branch 'master' into jgrpp	4 months ago