Jonathan G Rennison 58d841486e Merge branch 'master' into jgrpp ...

# Conflicts:
#	src/os/windows/font_win32.cpp
#	src/script/api/script_object.hpp
#	src/town_cmd.cpp
#	src/train_cmd.cpp
#	src/viewport.cpp
#	src/viewport_func.h

2022-12-27 01:00:40 +00:00

..

macosx

Merge branch 'master' into jgrpp

2022-12-27 01:00:40 +00:00

os2

Merge branch 'master' into jgrpp-beta

2021-10-18 18:01:27 +01:00

unix

Crashlog: Limit iterations of calls to bfd_find_inliner_info

2022-10-08 19:56:16 +01:00

windows

Merge branch 'master' into jgrpp

2022-12-27 01:00:40 +00:00

CMakeLists.txt

Add: introduce CMake for project management

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