Jonathan G Rennison 3ea1e27fdd Merge branch 'master' into jgrpp ... # Conflicts: # src/lang/german.txt # src/lang/korean.txt # src/lang/spanish_MX.txt # src/lang/traditional_chinese.txt # src/script/api/script_airport.cpp # src/script/api/script_rail.cpp		2022-06-06 01:05:00 +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	Change: [CMake] Disable newgrf scan for regression check	2022-05-27 19:57:50 +02: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