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 d09b504bc5 Merge branch 'master' into jgrpp
# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/release-linux.yml
#	.github/workflows/release-macos.yml
#	.github/workflows/release-source.yml
#	.github/workflows/release.yml
#	CMakeLists.txt
#	COMPILING.md
#	src/ai/ai_core.cpp
#	src/ai/ai_gui.cpp
#	src/bridge_gui.cpp
#	src/company_gui.cpp
#	src/console_cmds.cpp
#	src/core/CMakeLists.txt
#	src/core/smallmap_type.hpp
#	src/disaster_vehicle.h
#	src/effectvehicle_base.h
#	src/fontcache.cpp
#	src/game/game_core.cpp
#	src/game/game_gui.cpp
#	src/gamelog.cpp
#	src/gamelog_internal.h
#	src/group_gui.cpp
#	src/linkgraph/linkgraph.h
#	src/misc.cpp
#	src/network/core/config.h
#	src/network/core/udp.cpp
#	src/network/network_chat_gui.cpp
#	src/network/network_content_gui.cpp
#	src/network/network_gui.cpp
#	src/newgrf.cpp
#	src/newgrf_gui.cpp
#	src/newgrf_profiling.cpp
#	src/newgrf_profiling.h
#	src/object_gui.cpp
#	src/openttd.cpp
#	src/openttd.h
#	src/order_gui.cpp
#	src/os/windows/font_win32.cpp
#	src/rail_gui.cpp
#	src/road.cpp
#	src/road_gui.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.h
#	src/script/api/script_controller.cpp
#	src/script/api/script_roadtypelist.cpp
#	src/script/script_config.cpp
#	src/script/script_config.hpp
#	src/script/script_instance.cpp
#	src/script/script_scanner.cpp
#	src/script/squirrel.cpp
#	src/script/squirrel_helper.hpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/settings_type.h
#	src/table/settings/network_private_settings.ini
#	src/timetable_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/window_gui.h
12 months ago
..
ci-build.yml Merge branch 'master' into jgrpp 12 months ago
codeql.yml Merge branch 'master' into jgrpp 12 months ago
preview_build.yml Change: [CI] update emscripten and liblzma to the latest version (#10757) 1 year ago
preview_label.yml Update: bump peter-evans/repository-dispatch from 1 to 2 2 years ago
preview_push.yml Update: bump peter-evans/repository-dispatch from 1 to 2 2 years ago
release-docs.yml Github: Change release workflows to match upstream 1 year ago
release-linux-distros.yml Github: Re-add changes to upstream release workflows 1 year ago
release-linux.yml Fix: [CI] enable audio (alsa / jack / pulse) for generic Linux builds (#11051) 1 year ago
release-macos.yml Github: Re-add changes to upstream release workflows 1 year ago
release-source.yml Github: Disable survey key request for now 1 year ago
release-windows.yml Github: Re-add changes to upstream release workflows 1 year ago
release.yml Github: Re-add changes to upstream release workflows 1 year 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