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/os
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
6 months ago
..
emscripten Codechange: vendor the nlohmann-json library (#11290) 6 months ago
macosx Merge branch 'master' into jgrpp 8 months ago
steam Add: [Actions] Automatically upload releases to Steam (#8644) 3 years ago
windows Fix: Ensure logo for Windows Store common assets package is named correctly 1 year ago