Jonathan G Rennison 62afd94b47 Merge branch 'master' into jgrpp-beta ...

# Conflicts:
#	src/company_cmd.cpp
#	src/economy.cpp
#	src/lang/swedish.txt
#	src/network/network_command.cpp
#	src/news_gui.cpp
#	src/saveload/saveload.h
#	src/script/api/script_list.cpp
#	src/video/cocoa/cocoa_v.mm
#	src/video/sdl2_v.cpp

2021-11-01 18:54:43 +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

Add a release version string to rev.cpp

2021-09-06 17:49:08 +01: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