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.
OpenTTD-patches/.github/workflows
Jonathan G Rennison 42c8f50551 Merge branch 'master' into jgrpp
# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/release-linux.yml
#	.github/workflows/release-macos.yml
#	.github/workflows/release-windows.yml
#	.gitignore
#	COMPILING.md
#	src/company_gui.cpp
#	src/date_gui.cpp
#	src/engine.cpp
#	src/engine_func.h
#	src/fileio.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/newgrf_debug_gui.cpp
#	src/newgrf_gui.cpp
#	src/order_gui.cpp
#	src/osk_gui.cpp
#	src/rail_gui.cpp
#	src/road_gui.cpp
#	src/script/api/script_event_types.hpp
#	src/sl/oldloader_sl.cpp
#	src/smallmap_gui.cpp
#	src/station_cmd.cpp
#	src/toolbar_gui.cpp
#	src/town_gui.cpp
#	src/transparency_gui.cpp
#	src/vehicle_gui.cpp
#	src/widget.cpp
#	src/widget_type.h
#	src/widgets/dropdown.cpp
#	src/widgets/dropdown_func.h
#	src/widgets/dropdown_type.h
#	src/widgets/group_widget.h
#	src/widgets/vehicle_widget.h
#	src/window.cpp
#	src/window_gui.h
#	src/window_type.h
5 months ago
..
ci-build.yml Merge branch 'master' into jgrpp 5 months ago
codeql.yml Merge branch 'master' into jgrpp 6 months ago
preview-build.yml Codechange: vendor the nlohmann-json library (#11290) 7 months ago
preview.yml Fix: [CI] preview for one PR could cancel the preview of another (#11121) 11 months ago
release-docs.yml Github: Change release workflows to match upstream 12 months ago
release-linux-distros.yml Release: Remove ubuntu 18.04, debian buster. Add debian bookworm 9 months ago
release-linux.yml Merge branch 'master' into jgrpp 5 months ago
release-macos.yml Merge branch 'master' into jgrpp 5 months ago
release-source.yml Merge branch 'master' into jgrpp 7 months ago
release-windows.yml Merge branch 'master' into jgrpp 5 months ago
release.yml Change: [CI] upload releases to new CDN (#11093) 11 months ago
script-missing-mode-enforcement.yml Add: workflow and script for checking missing mode enforcements 1 year ago
unused-strings.yml Merge branch 'master' into jgrpp 1 year ago