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

2022-05-15 13:54:13 +01:00

..

Baseset.cmake

Codechange: [CMake] Add checks for baseset script parameters

2021-03-09 22:42:25 +01:00

CreateGRF.cmake

Fix: [CMake] Check nforenum and grfcodec return value

2021-04-24 21:16:06 +02:00

Desktop.cmake

Add: [CMake] Install menu and media files

2021-03-09 22:42:25 +01:00

FindVersion.cmake

Merge tag '12.0-beta1' into jgrpp-beta

2021-11-02 17:51:38 +00:00

GenerateWidget.cmake

Codechange: Make codestyle for CMake files consistent for 'control' statements

2020-09-25 14:43:13 +01:00

Regression.cmake

Fix: [CMake] Remove timestamps from regression output

2021-03-04 16:22:58 +01:00

SquirrelExport.cmake

Cleanup: [Script] Use nullptr instead of 0 or NULL

2021-06-17 16:18:30 +02:00

SquirrelIncludes.cmake

Codechange: [CMake] Pass API files list via a file to minimise command line length (#9874)

2022-05-01 00:39:59 +02:00