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	Test: Add upstream tests	6 months ago
crashlog_osx.cpp	Codechange: coding style fixes	5 months ago
font_osx.cpp	Merge branch 'master' into jgrpp	5 months ago
font_osx.h	Feature: Scalable OpenTTD TrueType font made by Zephyris.	5 months ago
macos.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
macos.mm	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
misc_osx.cpp	MacOS: Add workaround for std::variant	1 year ago
osx_main.cpp	Test: Add upstream tests	6 months ago
osx_stdafx.h	Merge branch 'master' into jgrpp-beta	3 years ago
string_osx.cpp	Merge branch 'master' into jgrpp	5 months ago
string_osx.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
survey_osx.cpp	Codechange: vendor the nlohmann-json library (#11290)	7 months ago