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 7f6b1d6b94 Merge branch 'master' into jgrpp ... # Conflicts: # src/company_cmd.cpp # src/company_func.h # src/core/overflowsafe_type.hpp # src/engine.cpp # src/music/midifile.cpp # src/network/network_command.cpp # src/newgrf_debug_gui.cpp # src/newgrf_roadstop.h # src/newgrf_spritegroup.cpp # src/os/macosx/crashlog_osx.cpp # src/os/unix/crashlog_unix.cpp # src/pathfinder/yapf/yapf_common.hpp # src/road_gui.cpp # src/saveload/engine_sl.cpp # src/script/api/script_depotlist.cpp # src/script/api/script_roadtypelist.cpp # src/settings_gui.cpp # src/settings_type.h # src/strings.cpp # src/table/settings/game_settings.ini		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	Codechange: automatic adding of _t to (u)int types, and WChar to char32_t	11 months ago
macos.h	Codechange: automatic adding of _t to (u)int types, and WChar to char32_t	11 months ago
macos.mm	Merge branch 'master' into jgrpp	6 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	…
string_osx.cpp	Merge branch 'master' into jgrpp	5 months ago
string_osx.h	Merge branch 'master' into jgrpp	6 months ago
survey_osx.cpp	Codechange: vendor the nlohmann-json library (#11290)	7 months ago