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

2024-03-12 17:44:28 +00:00

..

ci-build.yml

Merge branch 'master' into jgrpp

2024-03-12 17:44:28 +00:00

ci-emscripten.yml

Merge branch 'master' into jgrpp

2024-03-12 17:44:28 +00:00

ci-linux.yml

Merge branch 'master' into jgrpp

2024-03-12 17:44:28 +00:00

ci-macos.yml

Merge branch 'master' into jgrpp

2024-03-12 17:44:28 +00:00

ci-mingw.yml

Merge branch 'master' into jgrpp

2024-03-12 17:44:28 +00:00

ci-nightly.yml

Merge branch 'master' into jgrpp

2024-03-12 17:44:28 +00:00

ci-windows.yml

Merge branch 'master' into jgrpp

2024-03-12 17:44:28 +00:00

codeql.yml

Merge branch 'master' into jgrpp

2024-03-12 17:44:28 +00:00

preview-build.yml

Upgrade: [CI] bump the actions group with 9 updates (#11881)

2024-01-25 21:22:33 +00:00

preview.yml

Fix: [CI] preview for one PR could cancel the preview of another (#11121)

2023-07-08 12:10:15 +00:00

release-docs.yml

Upgrade: [CI] bump the actions group with 9 updates (#11881)

2024-01-25 21:22:33 +00:00

release-linux-dedicated.yml

Workflow: Upgrade image and actions for linux-dedicated build

2024-02-24 15:54:22 +00:00

release-linux-distros.yml

Workflow: Update actions in Linux distros release

2024-02-24 15:38:05 +00:00

release-linux.yml

Codechange: [CI] use "cargo install --locked" to use pinned dependency versions (#12243)

2024-03-09 11:42:09 +00:00

release-macos.yml

Merge branch 'master' into jgrpp

2024-03-12 17:44:28 +00:00

release-source.yml

Merge branch 'master' into jgrpp

2024-02-15 23:49:11 +00:00

release-windows.yml

Merge branch 'master' into jgrpp

2024-03-12 17:44:28 +00:00

release.yml

Workflow: Remove linux-legacy release

2024-02-24 15:38:05 +00:00

script-missing-mode-enforcement.yml

Upgrade: [CI] bump the actions group with 9 updates (#11881)

2024-01-25 21:22:33 +00:00

unused-strings.yml

Merge branch 'master' into jgrpp

2024-02-15 23:49:11 +00:00