Jonathan G Rennison 4042480806 Merge branch 'jgrpp' into jgrpp-beta ...

# Conflicts:
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/table/company_settings.ini
#	src/table/currency_settings.ini
#	src/table/gameopt_settings.ini
#	src/table/misc_settings.ini
#	src/table/settings.h.preamble
#	src/table/settings.ini
#	src/table/win32_settings.ini
#	src/table/window_settings.ini

2021-10-08 18:12:04 +01:00

..

macosx

Merge branch 'jgrpp' into jgrpp-beta

2021-10-08 18:12:04 +01:00

os2

Thread: Adjust checks for whether current thread is the game thread

2021-06-20 10:00:36 +01:00

unix

Add CheckCaches mode to emit a log/save/screenshot on detected issue

2021-10-03 23:57:27 +01:00

windows

Merge branch 'jgrpp' into jgrpp-beta

2021-10-08 18:12:04 +01:00

CMakeLists.txt

Add: introduce CMake for project management

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