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
This commit is contained in:
@@ -37,7 +37,7 @@
|
||||
#include "../base_media_base.h"
|
||||
#include "../blitter/factory.hpp"
|
||||
|
||||
#include <nlohmann/json.hpp>
|
||||
#include "../3rdparty/nlohmann/json.hpp"
|
||||
|
||||
#include "../safeguards.h"
|
||||
|
||||
|
Reference in New Issue
Block a user