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		5 months ago
..
CMakeLists.txt	Codechange: refactor the Windows-only DllLoader in a cross-platform LibraryLoader (#11751)	5 months ago
crashlog_win.cpp	Merge branch 'master' into jgrpp	5 months ago
font_win32.cpp	Merge branch 'master' into jgrpp	5 months ago
font_win32.h	Feature: Scalable OpenTTD TrueType font made by Zephyris.	5 months ago
library_loader_win.cpp	Fix: compilation without precompiled headers (#11770)	5 months ago
ottdres.rc.in	Merge branch 'master' into jgrpp	7 months ago
string_uniscribe.cpp	Merge branch 'master' into jgrpp	5 months ago
string_uniscribe.h	Merge branch 'master' into jgrpp	6 months ago
survey_win.cpp	MinGW: Remove direct mingw-std-threads includes	6 months ago
win32.cpp	Rename ShowInfo to ShowInfoI, add ShowInfo fmt macro	5 months ago
win32.h	Merge branch 'master' into jgrpp	5 months ago
win32_main.cpp	Test: Add upstream tests	6 months ago