Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
json
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
json
Commits
360f0f37
Commit
360f0f37
authored
Jun 24, 2016
by
Niels
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
updated README and ChangeLog
parent
c74b9ff4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
ChangeLog.md
ChangeLog.md
+6
-1
README.md
README.md
+1
-0
No files found.
ChangeLog.md
View file @
360f0f37
...
@@ -3,7 +3,12 @@ All notable changes to this project will be documented in this file. This projec
...
@@ -3,7 +3,12 @@ All notable changes to this project will be documented in this file. This projec
## [Unreleased](https://github.com/nlohmann/json/tree/HEAD)
## [Unreleased](https://github.com/nlohmann/json/tree/HEAD)
[
Full Changelog
](
https://github.com/nlohmann/json/compare/v1.1.0...HEAD
)
[
Full Changelog
](
https://github.com/nlohmann/json/compare/v2.0.0...HEAD
)
-
fixed a tiny typo
[
\#271
](
https://github.com/nlohmann/json/pull/271
)
(
[thelostt](https://github.com/thelostt
)
)
## [v2.0.0](https://github.com/nlohmann/json/releases/tag/v2.0.0) (2016-06-23)
[
Full Changelog
](
https://github.com/nlohmann/json/compare/v1.1.0...v2.0.0
)
-
concatenate objects
[
\#252
](
https://github.com/nlohmann/json/issues/252
)
-
concatenate objects
[
\#252
](
https://github.com/nlohmann/json/issues/252
)
-
Unit test fails when doing a CMake out-of-tree build
[
\#241
](
https://github.com/nlohmann/json/issues/241
)
-
Unit test fails when doing a CMake out-of-tree build
[
\#241
](
https://github.com/nlohmann/json/issues/241
)
...
...
README.md
View file @
360f0f37
...
@@ -483,6 +483,7 @@ I deeply appreciate the help of the following people.
...
@@ -483,6 +483,7 @@ I deeply appreciate the help of the following people.
- [Róbert Márki](https://github.com/robertmrk) added a fix to use move iterators and improved the integration via CMake.
- [Róbert Márki](https://github.com/robertmrk) added a fix to use move iterators and improved the integration via CMake.
- [Chris Kitching](https://github.com/ChrisKitching) cleaned up the CMake files.
- [Chris Kitching](https://github.com/ChrisKitching) cleaned up the CMake files.
- [Tom Needham](https://github.com/06needhamt) fixed a subtle bug with MSVC 2015 which was also proposed by [Michael K.](https://github.com/Epidal).
- [Tom Needham](https://github.com/06needhamt) fixed a subtle bug with MSVC 2015 which was also proposed by [Michael K.](https://github.com/Epidal).
- [Mário Feroldi](https://github.com/thelostt) fixed a small typo.
Thanks a lot for helping out!
Thanks a lot for helping out!
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment