OpenTTD-patches/.github/workflows
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
2024-05-28 20:33:35 +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-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-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 Upgrade: [CI] bump the actions group with 9 updates (#11881) 2024-01-25 21:22:33 +00: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