mirror/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-11-24 06:29:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
ac3922c7aa
json/include/nlohmann
History
Niels Lohmann ac3922c7aa
Merge branch 'develop' of https://github.com/nlohmann/json into clang_windows 
 Conflicts:
	include/nlohmann/detail/input/binary_reader.hpp
	include/nlohmann/detail/input/input_adapters.hpp
	include/nlohmann/detail/input/lexer.hpp
	include/nlohmann/detail/output/binary_writer.hpp
	include/nlohmann/json.hpp
	single_include/nlohmann/json.hpp
2020-06-27 13:14:48 +02:00
..
detail Merge branch 'develop' of https://github.com/nlohmann/json into clang_windows 2020-06-27 13:14:48 +02:00
thirdparty/hedley ⬆️ Hedley 13 2020-04-06 11:56:33 +02:00
adl_serializer.hpp 🎨 replace alternative operators (and, not, or) 2020-06-03 14:20:36 +02:00
byte_container_with_subtype.hpp 📝 update documentation 2020-05-22 18:21:37 +02:00
json_fwd.hpp Add binary type support to all binary file formats, as well as an internally represented binary type 2020-04-14 10:22:45 -04:00
json.hpp Merge branch 'develop' of https://github.com/nlohmann/json into clang_windows 2020-06-27 13:14:48 +02:00