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 5b7db9d849 Merge branch 'master' into jgrpp
# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/commit-checker.yml
#	src/command.cpp
#	src/company_cmd.cpp
#	src/company_gui.cpp
#	src/crashlog.cpp
#	src/economy.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/misc_gui.cpp
#	src/newgrf_config.cpp
#	src/openttd.cpp
#	src/settings_gui.cpp
#	src/ship_cmd.cpp
#	src/table/settings/gui_settings.ini
2 years ago
..
ci-build.yml Merge branch 'master' into jgrpp 2 years ago
preview_build.yml Update: bump actions/checkout from 2 to 3 2 years 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.yml Merge branch 'master' into jgrpp 2 years ago
unused-strings.yml Merge branch 'master' into jgrpp 2 years ago