Jonathan G Rennison de36e9545e Merge branch 'master' into jgrpp ...

# Conflicts:
#	src/cargopacket.h
#	src/cargotype.h
#	src/station_base.h
#	src/station_cmd.cpp
#	src/timer/timer_game_common.h
#	src/town.h

2024-06-13 20:44:49 +01:00

..

CMakeLists.txt

…

freetypefontcache.cpp

Merge branch 'master' into jgrpp

2024-05-30 17:54:01 +01:00

spritefontcache.cpp

Merge branch 'master' into jgrpp

2024-06-08 22:57:36 +01:00

spritefontcache.h

Change: Allow TrueType fonts to provide our private-use glyphs.

2024-01-14 22:50:56 +01:00

truetypefontcache.cpp

Merge branch 'master' into jgrpp

2024-06-13 20:44:49 +01:00

truetypefontcache.h

Merge branch 'master' into jgrpp

2024-05-07 17:21:50 +01:00