Commit Graph

7 Commits

Author SHA1 Message Date
Niels Lohmann
88fbbd3aa8
Merge branch 'develop' of https://github.com/nlohmann/json into bon8
 Conflicts:
	docs/examples/to_bon8.cpp
	docs/examples/to_bon8.output
	docs/mkdocs/docs/api/basic_json/to_bon8.md
	include/nlohmann/detail/input/binary_reader.hpp
	include/nlohmann/detail/input/input_adapters.hpp
	include/nlohmann/detail/output/binary_writer.hpp
	single_include/nlohmann/json.hpp
	test/CMakeLists.txt
	tests/src/unit-binary_formats.cpp
	tests/src/unit-bon8.cpp
2022-05-01 18:46:44 +02:00
Niels Lohmann
b21c345179
Reorganize directories (#3462)
* 🚚 move files
* 🚚 rename doc folder to docs
* 🚚 rename test folder to tests
2022-05-01 09:41:50 +02:00
Niels
91c330ae01 reorganized repo 2015-06-21 21:24:03 +02:00
Niels
4bb5126502 more documentation 2015-06-21 18:30:08 +02:00
Niels
c40e85920f more documentation 2015-06-21 09:44:12 +02:00
Niels
bb13c931b3 more documentation 2015-06-21 02:14:01 +02:00
Niels
e63c508172 overworked doxygen 2015-06-21 00:59:33 +02:00