Jonathan G Rennison ae9b416684 Merge branch 'master' into jgrpp ... # Conflicts: # src/ai/ai_core.cpp # src/ai/ai_gui.cpp # src/ai/ai_instance.cpp # src/console_cmds.cpp # src/engine_type.h # src/game/game_gui.cpp # src/game/game_instance.cpp # src/goal.cpp # src/goal_cmd.h # src/lang/english.txt # src/lang/estonian.txt # src/network/network_client.cpp # src/newgrf.cpp # src/newgrf_generic.h # src/openttd.cpp # src/saveload/saveload.h # src/script/api/script_log.cpp # src/script/api/script_town.cpp # src/settings_table.cpp # src/station_cmd.cpp # src/station_cmd.h # src/station_map.h # src/strings.cpp # src/table/settings/difficulty_settings.ini # src/table/settings/gui_settings.ini # src/tbtr_template_gui_main.h # src/timetable_cmd.cpp # src/timetable_cmd.h # src/timetable_gui.cpp # src/town_gui.cpp # src/train_gui.cpp # src/water_cmd.cpp		2023-02-11 23:05:22 +00:00
..
Baseset.cmake
CreateGRF.cmake
Desktop.cmake	Add: [CMake] Install menu and media files	2021-03-09 22:42:25 +01:00
FindVersion.cmake	cmake: Don't try to write rev.cpp/etc if no path specified	2022-06-12 09:18:42 +01:00
GenerateWidget.cmake	Codechange: [CMake] Auto-fill list of #include in script_window.hpp (#10103)	2022-10-24 12:35:58 +02:00
Regression.cmake	Change: [CMake] Disable newgrf scan for regression check	2022-05-27 19:57:50 +02:00
SquirrelExport.cmake	Fix: no need to cast enums down to int32; they will be automatically promoted to int64	2023-01-31 20:09:48 +01: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