Jonathan G Rennison 483ed2f468 Merge branch 'master' into jgrpp ...

# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/commit-checker.yml
#	src/openttd.cpp

2020-12-27 20:16:16 +00:00

..

macosx

Update: Merge branch 'jgrpp_master_cmake' into jgrpp_cmake

2020-06-28 21:56:43 +01:00

os2

Merge branch 'master' into jgrpp

2020-07-07 17:28:19 +01:00

unix

Merge branch 'master' into jgrpp

2020-07-07 17:28:19 +01:00

windows

Merge branch 'master' into jgrpp

2020-12-27 20:16:16 +00:00

CMakeLists.txt

Add: introduce CMake for project management

2020-06-05 19:36:05 +02:00