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/os
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
..
emscripten Change: [Emscripten] update to 2.0.34 and use Release over RelWithDebInfo (#9696) 3 years ago
macosx Add: Specify minimum version for macOS (#9689) 3 years ago
os2 Change: Heading for 1.11 now 4 years ago
steam Add: [Actions] Automatically upload releases to Steam (#8644) 3 years ago
windows Feature: [Actions] Package builds for the Windows Store automatically 2 years ago