Jonathan G Rennison 15f4e62936 Merge branch 'master' into jgrpp ...

# Conflicts:
#	src/network/network.cpp
#	src/pathfinder/yapf/yapf.h
#	src/pathfinder/yapf/yapf_ship.cpp
#	src/saveload/afterload.cpp
#	src/ship_cmd.cpp
#	src/station_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp

2024-07-06 18:24:53 +01:00

..

ci-build.yml

Merge branch 'master' into jgrpp

2024-04-18 17:37:25 +01:00

ci-emscripten.yml

Merge branch 'master' into jgrpp

2024-07-06 18:24:53 +01: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-04-18 17:37:25 +01: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

Codechange: upgrade Emscripten to 3.1.57 (#12526)

2024-04-18 19:37:33 +02:00

preview.yml

Codefix: allow preview label on PRs against release branches too (#12310)

2024-03-16 16:49:03 +01: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

Change: [CI] Always use latest stable Xcode (#12390)

2024-03-28 21:22:20 +01: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-05-28 20:33:35 +01: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