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 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	11 months ago
crashlog_osx.cpp	Merge branch 'master' into jgrpp	7 months ago
font_osx.cpp	Add missing c_str() in font_osx.cpp	9 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	Build: Fix MacOS compilation	9 months ago
misc_osx.cpp	MacOS: Add workaround for std::variant	1 year ago
osx_stdafx.h	Merge branch 'master' into jgrpp-beta	3 years ago
string_osx.cpp	Codechange: automatic adding of _t to (u)int types, and WChar to char32_t	11 months ago
string_osx.h	Codechange: automatic adding of _t to (u)int types, and WChar to char32_t	11 months ago
survey_osx.cpp	Codechange: vendor the nlohmann-json library (#11290)	7 months ago