Jonathan G Rennison faf32200cf Merge tag '12.0-beta1' into jgrpp-beta ... # Conflicts: # CMakeLists.txt # bin/ai/CMakeLists.txt # bin/game/CMakeLists.txt # src/build_vehicle_gui.cpp # src/console_cmds.cpp # src/core/overflowsafe_type.hpp # src/fios.cpp # src/lang/english.txt # src/lang/german.txt # src/lang/korean.txt # src/lang/polish.txt # src/network/core/game_info.cpp # src/network/core/game_info.h # src/network/core/tcp_game.cpp # src/network/core/tcp_game.h # src/network/network.cpp # src/network/network_client.cpp # src/network/network_client.h # src/network/network_coordinator.cpp # src/network/network_gui.cpp # src/network/network_server.cpp # src/network/network_server.h # src/newgrf_engine.cpp # src/openttd.cpp # src/rev.cpp.in # src/settings_type.h # src/train.h # src/train_cmd.cpp		2021-11-02 17:51:38 +00: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	Fix: [CMake] CMake may use || at the end of custom commands	2021-02-22 23:17:45 +01:00