Jonathan G Rennison 23b974fb39 Merge branch 'master' into jgrpp ...

# Conflicts:
#	src/fontcache.cpp
#	src/openttd.cpp
#	src/os/macosx/font_osx.cpp
#	src/os/unix/font_unix.cpp
#	src/os/windows/font_win32.cpp
#	src/strings.cpp

2022-10-03 20:32:26 +01:00

..

CMakeLists.txt

…

freetypefontcache.cpp

Merge branch 'master' into jgrpp

2022-10-03 20:32:26 +01:00

spritefontcache.cpp

Merge branch 'master' into jgrpp

2022-10-03 20:32:26 +01:00

spritefontcache.h

…

truetypefontcache.cpp

Merge branch 'master' into jgrpp

2022-10-03 20:32:26 +01:00

truetypefontcache.h

Merge branch 'master' into jgrpp

2022-10-03 20:32:26 +01:00