Merge branch 'upstream-NLohmannJson' into move-jsonhpp-to-thirdparty (3b7a0d8d) · Commits · Podhorszki, Norbert / ADIOS2 · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

ADIOS2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

3b7a0d8d

Commit 3b7a0d8d authored 7 years ago by Atkins, Charles Vernon

Downloads
- Plain Diff

Merge branch 'upstream-NLohmannJson' into move-jsonhpp-to-thirdparty

* upstream-NLohmannJson:
  NLohmannJson 2017-02-25 (9ff0cc0f)

parents 9a8665ff 8e714660

No related branches found

No related tags found

Loading

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

thirdparty/NLohmannJson/json/LICENSE.MIT 21 additions, 0 deletions

thirdparty/NLohmannJson/json/LICENSE.MIT
thirdparty/NLohmannJson/json/src/json.hpp 13003 additions, 0 deletions

thirdparty/NLohmannJson/json/src/json.hpp

with 13024 additions and 0 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment