Jonathan G Rennison eab32e8861 Merge branch 'master' into jgrpp ...

# Conflicts:
#	CMakeLists.txt
#	src/blitter/32bpp_optimized.cpp
#	src/lang/serbian.txt

2021-03-04 15:33:52 +00:00

..

Baseset.cmake

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

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

CreateGRF.cmake

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

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

FindVersion.cmake

Merge branch 'master' into jgrpp

2020-12-27 20:16:16 +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

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