Jonathan G Rennison 227041008f Merge branch 'master' into jgrpp ...

# Conflicts:
#	src/debug.cpp
#	src/lang/russian.txt
#	src/misc_gui.cpp
#	src/os/windows/crashlog_win.cpp
#	src/os/windows/font_win32.cpp
#	src/os/windows/win32.cpp
#	src/rail_cmd.cpp
#	src/window_gui.h

2021-04-11 03:05:08 +01:00

..

macosx

Merge branch 'master' into jgrpp

2021-04-05 17:51:45 +01:00

os2

Merge branch 'master' into jgrpp

2021-04-11 03:05:08 +01:00

unix

Merge branch 'master' into jgrpp

2021-04-11 03:05:08 +01:00

windows

Merge branch 'master' into jgrpp

2021-04-11 03:05:08 +01:00

CMakeLists.txt

Add: introduce CMake for project management

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