You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Jonathan G Rennison d7b75614bb Merge branch 'master' into jgrpp ... # Conflicts: # media/baseset/CMakeLists.txt # src/build_vehicle_gui.cpp # src/console.cpp # src/debug.cpp # src/fontcache/freetypefontcache.cpp # src/network/network.cpp # src/openttd.cpp # src/os/macosx/font_osx.cpp # src/os/windows/font_win32.cpp # src/settings_gui.cpp # src/video/sdl2_v.cpp # src/widgets/settings_widget.h # src/window_gui.h		4 months ago
..
CMakeLists.txt	…
freetypefontcache.cpp	Merge branch 'master' into jgrpp	4 months ago
spritefontcache.cpp	Adding of _t to (u)int types, and WChar to char32_t	4 months ago
spritefontcache.h	Change: Allow TrueType fonts to provide our private-use glyphs.	4 months ago
truetypefontcache.cpp	Adding of _t to (u)int types, and WChar to char32_t	4 months ago
truetypefontcache.h	Adding of _t to (u)int types, and WChar to char32_t	4 months ago