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.
OpenTTD-patches/src/os/windows
Jonathan G Rennison cf4cf5c08f Codechange: vendor the nlohmann-json library (#11290)
(cherry picked from commit ba67f39db6)

# Conflicts:
#	.github/workflows/ci-build.yml
#	CMakeLists.txt
#	COMPILING.md
#	src/os/macosx/survey_osx.cpp
#	src/os/windows/survey_win.cpp
#	src/script/api/script_admin.cpp
#	src/script/api/script_event_types.cpp
#	src/tests/test_script_admin.cpp
7 months ago
..
CMakeLists.txt Merge branch 'master' into jgrpp 12 months ago
crashlog_win.cpp Merge branch 'master' into jgrpp 7 months ago
font_win32.cpp Merge branch 'master' into jgrpp 9 months ago
font_win32.h Codechange: automatic adding of _t to (u)int types, and WChar to char32_t 11 months ago
ottdres.rc.in Merge branch 'master' into jgrpp 7 months ago
string_uniscribe.cpp Codechange: automatic adding of _t to (u)int types, and WChar to char32_t 11 months ago
string_uniscribe.h Codechange: automatic adding of _t to (u)int types, and WChar to char32_t 11 months ago
survey_win.cpp Codechange: vendor the nlohmann-json library (#11290) 7 months ago
win32.cpp Merge branch 'master' into jgrpp 9 months ago
win32.h Merge branch 'master' into jgrpp 1 year ago