Jonathan G Rennison 2f8e63e954 Merge branch 'master' into jgrpp ... # Conflicts: # src/gfx.cpp # src/lang/traditional_chinese.txt # src/station_cmd.cpp		2022-01-04 17:42:36 +00:00
..
scripts	Merge tag '12.0-beta1' into jgrpp-beta	2021-11-02 17:51:38 +00:00
AddCustomXXXTimestamp.cmake	Codechange: Make codestyle for CMake files consistent for 'control' statements	2020-09-25 14:43:13 +01:00
CompileFlags.cmake	Merge branch 'master' into jgrpp	2022-01-04 17:42:36 +00:00
CreateGrfCommand.cmake	Fix: [CMake] Incorrect dependency checks for GRF	2021-04-24 21:16:06 +02:00
CreateRegression.cmake	Fix: [CMake] CMAKE_SOURCE_DIR may contain regex commands	2021-02-22 23:17:45 +01:00
Endian.cmake	Codechange: Make codestyle for CMake files consistent for 'control' statements	2020-09-25 14:43:13 +01:00
FindAllegro.cmake	Fix: [CMake] our allegro drivers use v4, so skip v5 if found (#8653)	2021-02-07 12:54:02 +01:00
FindBFD.cmake	CMake: Enable debug line tables if BFD found	2020-06-30 22:30:29 +01:00
FindBuiltins.cmake
FindDbgHelp.cmake	CMake: Add DbgHelp define for MinGW	2020-07-01 00:25:50 +01:00
FindDemangle.cmake
FindDL.cmake
FindEditbin.cmake	Codechange: Make codestyle for CMake files consistent for 'control' statements	2020-09-25 14:43:13 +01:00
FindFluidsynth.cmake	Codechange: Make codestyle for CMake files consistent for 'control' statements	2020-09-25 14:43:13 +01:00
FindFontconfig.cmake	Codechange: Make codestyle for CMake files consistent for 'control' statements	2020-09-25 14:43:13 +01:00
FindGrfcodec.cmake
FindIconv.cmake	Fix: remove remainining usages of FALSE in CMake files	2020-06-30 09:43:00 +01:00
FindICU.cmake	Change: [CMake] Bump minimum version to 3.9	2021-02-07 16:21:13 +01:00
FindLZO.cmake	Codechange: Make codestyle for CMake files consistent for 'control' statements	2020-09-25 14:43:13 +01:00
FindMacUcontext.cmake
FindPandoc.cmake	Change: Convert .md to .rtf for Windows/Mac packages	2021-02-08 23:23:24 +00:00
FindSelfDbg.cmake
FindSigaction.cmake
FindSigaltstack.cmake
FindSSE.cmake	Codechange: Make codestyle for CMake files consistent for 'control' statements	2020-09-25 14:43:13 +01:00
FindUcontext.cmake
FindXaudio2.cmake	Fix: [CMake] Don't detect XAudio2 if defines are missing	2020-11-26 19:06:03 +00:00
FindZSTD.cmake	Add: Support Zstandard(zstd) savegame compression	2021-03-01 18:08:28 +00:00
InstallAndPackage.cmake	Merge branch 'master' into jgrpp-beta	2021-09-27 22:47:23 +01:00
LinkPackage.cmake	Zstd: Change package status to recommended	2021-03-01 23:08:23 +00:00
MSVCFilters.cmake	Codechange: Add CMake source group for the saveload compat tables.	2021-07-04 16:31:59 +02:00
Options.cmake	Feature: [Actions / CMake] support for generic linux builds (#8641)	2021-02-05 12:31:27 +01:00
PackageBundle.cmake	Fix: [bundle] custom launch.sh is no longer required for Mac OS	2020-12-19 18:26:29 +01:00
PackageDeb.cmake	CPack: Change debian package name, mark as conflicting with openttd	2021-03-13 12:00:40 +00:00
PackageNSIS.cmake
SourceList.cmake	Codechange: Make codestyle for CMake files consistent for 'control' statements	2020-09-25 14:43:13 +01:00
Static.cmake	Codechange: Make codestyle for CMake files consistent for 'control' statements	2020-09-25 14:43:13 +01:00