Commit Graph

3 Commits (87ee18b6b96307a73802999afd5c7307922e9b3c)

Author SHA1 Message Date
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
2 years ago
Peter Nelson b00e18fe9f Cleanup: Remove unused GetUnicodeGlyph() 2 years ago
Peter Nelson 2cdd8b7429 Change: Separate fontcache implementations. 2 years ago