Jonathan G Rennison 8eb27e1ac7 Merge branch 'master' into jgrpp ...

# Conflicts:
#	src/company_cmd.cpp
#	src/lang/japanese.txt
#	src/network/core/config.h
#	src/network/core/packet.cpp
#	src/network/core/tcp.cpp
#	src/network/network_content.cpp
#	src/network/network_server.cpp
#	src/network/network_udp.cpp
#	src/toolbar_gui.cpp
#	src/vehicle_gui_base.h

2021-04-25 22:14:59 +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 branch 'master' into jgrpp

2021-04-25 02:14:58 +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

Codechange: Make codestyle for CMake files consistent for 'control' statements

2020-09-25 14:43:13 +01:00

SquirrelIncludes.cmake

Fix: [CMake] CMake may use || at the end of custom commands

2021-02-22 23:17:45 +01:00