Niels Lohmann 5e9bf559b1 # Conflicts: ...

#	.github/workflows/macos.yml
#	include/nlohmann/detail/input/parser.hpp
#	include/nlohmann/detail/meta/std_fs.hpp
#	include/nlohmann/json.hpp
#	single_include/nlohmann/json.hpp

2024-11-16 23:23:05 +01:00

..

abi

JSON for Modern C++ 3.11.3 (#4222)

2023-11-28 22:36:31 +01:00

benchmarks

JSON for Modern C++ 3.11.3 (#4222)

2023-11-28 22:36:31 +01:00

cmake_add_subdirectory

JSON for Modern C++ 3.11.3 (#4222)

2023-11-28 22:36:31 +01:00

cmake_fetch_content

JSON for Modern C++ 3.11.3 (#4222)

2023-11-28 22:36:31 +01:00

cmake_fetch_content2

JSON for Modern C++ 3.11.3 (#4222)

2023-11-28 22:36:31 +01:00

cmake_import

JSON for Modern C++ 3.11.3 (#4222)

2023-11-28 22:36:31 +01:00

cmake_import_minver

JSON for Modern C++ 3.11.3 (#4222)

2023-11-28 22:36:31 +01:00

cmake_target_include_directories

JSON for Modern C++ 3.11.3 (#4222)

2023-11-28 22:36:31 +01:00

cuda_example

JSON for Modern C++ 3.11.3 (#4222)

2023-11-28 22:36:31 +01:00

reports

Reorganize directories (#3462)

2022-05-01 09:41:50 +02:00

src

# Conflicts:

2024-11-16 23:23:05 +01:00

thirdparty

Fix CI (#4160)

2023-09-23 17:19:28 +02:00

CMakeLists.txt

Accept NEW CMake policies up to CMake 3.14 (#4112)

2023-09-25 09:31:26 +02:00

fuzzing.md

Document fuzzer usage (#3478)

2022-05-09 08:02:41 +02:00

Makefile

Reorganize directories (#3462)

2022-05-01 09:41:50 +02:00