Jonathan G Rennison 86a6f63e2f Merge branch 'master' into jgrpp ... # Conflicts: # .github/workflows/ci-build.yml # .github/workflows/codeql.yml # .github/workflows/commit-checker.yml # .github/workflows/release-linux-legacy.yml # .github/workflows/release-linux.yml # .github/workflows/release-macos.yml # .github/workflows/release-windows-store.yml # .github/workflows/release-windows.yml # .github/workflows/upload-cdn.yml # .github/workflows/upload-gog.yml # .github/workflows/upload-steam.yml # src/console_cmds.cpp # src/core/math_func.hpp # src/fios.cpp # src/fios.h # src/intro_gui.cpp # src/network/network_server.cpp # src/openttd.cpp # src/settings.cpp # src/settings_gui.cpp # src/settings_internal.h # src/settings_table.cpp # src/settings_type.h # src/table/settings.h.preamble # src/table/settings/company_settings.ini # src/table/settings/currency_settings.ini # src/table/settings/difficulty_settings.ini # src/table/settings/economy_settings.ini # src/table/settings/game_settings.ini # src/table/settings/gui_settings.ini # src/table/settings/linkgraph_settings.ini # src/table/settings/locale_settings.ini # src/table/settings/misc_settings.ini # src/table/settings/multimedia_settings.ini # src/table/settings/network_private_settings.ini # src/table/settings/network_settings.ini # src/table/settings/news_display_settings.ini # src/table/settings/old_gameopt_settings.ini # src/table/settings/pathfinding_settings.ini # src/table/settings/script_settings.ini # src/table/settings/win32_settings.ini # src/table/settings/window_settings.ini # src/table/settings/world_settings.ini # src/viewport.cpp # src/viewport_func.h # src/window.cpp		2024-02-15 23:49:11 +00:00
..
ci-build.yml	Merge branch 'master' into jgrpp	2024-02-15 23:49:11 +00:00
codeql.yml	Merge branch 'master' into jgrpp	2024-02-15 23:49:11 +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	Fix: [CI] preview for one PR could cancel the preview of another (#11121)	2023-07-08 12:10:15 +00: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	Release workflow: Remove gcc-problem-matcher from legacy/dedicated builds	2024-01-25 23:22:21 +00:00
release-linux-distros.yml	Use gcc-10 for building Ubuntu 20.04 release binaries	2024-01-25 01:03:53 +00:00
release-linux-legacy.yml	Release workflow: Remove gcc-problem-matcher from legacy/dedicated builds	2024-01-25 23:22:21 +00:00
release-linux.yml	Merge branch 'master' into jgrpp	2024-02-15 23:49:11 +00:00
release-macos.yml	Merge branch 'master' into jgrpp	2024-02-15 23:49:11 +00: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-02-15 23:49:11 +00:00
release.yml	Remove: [CI] Linux Legacy support (#11882)	2024-01-25 23:24:43 +01: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