Jonathan G Rennison 5b78090a61 Merge branch 'master' into jgrpp ... # Conflicts: # CMakeLists.txt # src/saveload/town_sl.cpp # src/screenshot.h # src/script/api/ai/ai_date.hpp.sq # src/script/api/ai/ai_marine.hpp.sq # src/script/api/ai/ai_station.hpp.sq # src/script/api/game/game_date.hpp.sq # src/script/api/game/game_marine.hpp.sq # src/script/api/game/game_station.hpp.sq # src/script/api/game/game_window.hpp.sq # src/script/api/script_window.hpp # src/script/api/template/template_window.hpp.sq # src/signal.cpp # src/statusbar_gui.cpp # src/toolbar_gui.cpp # src/viewport.cpp # src/viewport_func.h		2020-08-27 18:31:09 +01:00
..
Baseset.cmake	Codechange: rework how grf and ob[msg] are generated	2020-06-05 19:36:05 +02:00
CreateGRF.cmake	Codechange: rework how grf and ob[msg] are generated	2020-06-05 19:36:05 +02:00
FindVersion.cmake	version_utils.sh: Fix getting current version	2020-07-12 12:59:24 +01:00
GenerateWidget.cmake	Change: rewrote generate_widget in CMake	2020-07-16 00:53:26 +02:00
Regression.cmake	Fix: [CMake] Don't strip final newline from regression output.	2020-07-27 17:26:19 +01:00
SquirrelExport.cmake	Change: rewrote squirrel_export in CMake	2020-07-16 00:53:26 +02:00
SquirrelIncludes.cmake	Change: rewrote squirrel_export in CMake	2020-07-16 00:53:26 +02:00