Skip to content

Commit 5dfd2c9

Browse files
nlohmannnlohmann
committed
Merge branch 'release/2.0.5' into develop
2 parents 6bbcdc1 + 3d104f1 commit 5dfd2c9

40 files changed

+46
-39
lines changed

‎CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required(VERSION 3.0)
22

33
# define the project
4-
project(nlohmann_json VERSION 2.0.4 LANGUAGES CXX)
4+
project(nlohmann_json VERSION 2.0.5 LANGUAGES CXX)
55

66
enable_testing()
77

‎ChangeLog.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
# Change Log
22
All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/).
33

4+
## [v2.0.5](https://github.com/nlohmann/json/releases/tag/v2.0.5) (2016-09-14)
5+
[Full Changelog](https://github.com/nlohmann/json/compare/v2.0.4...v2.0.5)
6+
7+
- make json\_benchmarks no longer working in 2.0.4 [\#310](https://github.com/nlohmann/json/issues/310)
8+
9+
- \[feature request\]: schema validator and comments [\#311](https://github.com/nlohmann/json/issues/311)
10+
411
## [v2.0.4](https://github.com/nlohmann/json/releases/tag/v2.0.4) (2016-09-11)
512
[Full Changelog](https://github.com/nlohmann/json/compare/v2.0.3...v2.0.4)
613

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[![Build Status](https://travis-ci.org/nlohmann/json.svg?branch=master)](https://travis-ci.org/nlohmann/json)
44
[![Build Status](https://ci.appveyor.com/api/projects/status/1acb366xfyg3qybk/branch/develop?svg=true)](https://ci.appveyor.com/project/nlohmann/json)
55
[![Coverage Status](https://img.shields.io/coveralls/nlohmann/json.svg)](https://coveralls.io/r/nlohmann/json)
6-
[![Try online](https://img.shields.io/badge/try-online-blue.svg)](http://melpon.org/wandbox/permlink/MN72DYughLUXjVLk)
6+
[![Try online](https://img.shields.io/badge/try-online-blue.svg)](http://melpon.org/wandbox/permlink/r3wa3rI5yxgQQcrm)
77
[![Documentation](https://img.shields.io/badge/docs-doxygen-blue.svg)](http://nlohmann.github.io/json)
88
[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/nlohmann/json/master/LICENSE.MIT)
99
[![Github Releases](https://img.shields.io/github/release/nlohmann/json.svg)](https://github.com/nlohmann/json/releases)

‎doc/Doxyfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#---------------------------------------------------------------------------
66
DOXYFILE_ENCODING = UTF-8
77
PROJECT_NAME = "JSON for Modern C++"
8-
PROJECT_NUMBER = 2.0.4
8+
PROJECT_NUMBER = 2.0.5
99
PROJECT_BRIEF =
1010
PROJECT_LOGO =
1111
OUTPUT_DIRECTORY = .

‎doc/examples/README.link

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<a target="_blank" href="http://melpon.org/wandbox/permlink/MN72DYughLUXjVLk"><b>online</b></a>
1+
<a target="_blank" href="http://melpon.org/wandbox/permlink/r3wa3rI5yxgQQcrm"><b>online</b></a>

‎doc/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,4 +268,4 @@ The container functions known from STL have been extended to support the differe
268268
@author [Niels Lohmann](http://nlohmann.me)
269269
@see https://github.com/nlohmann/json to download the source code
270270

271-
@version 2.0.4
271+
@version 2.0.5

‎src/json.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
__ _____ _____ _____
33
__| | __| | | | JSON for Modern C++
4-
| | |__ | | | | | | version 2.0.4
4+
| | |__ | | | | | | version 2.0.5
55
|_____|_____|_____|_|___| https://github.com/nlohmann/json
66
77
Licensed under the MIT License <http://opensource.org/licenses/MIT>.

‎src/json.hpp.re2c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
__ _____ _____ _____
33
__| | __| | | | JSON for Modern C++
4-
| | |__ | | | | | | version 2.0.4
4+
| | |__ | | | | | | version 2.0.5
55
|_____|_____|_____|_|___| https://github.com/nlohmann/json
66

77
Licensed under the MIT License <http://opensource.org/licenses/MIT>.

‎test/src/fuzz.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
__ _____ _____ _____
33
__| | __| | | | JSON for Modern C++ (fuzz test support)
4-
| | |__ | | | | | | version 2.0.4
4+
| | |__ | | | | | | version 2.0.5
55
|_____|_____|_____|_|___| https://github.com/nlohmann/json
66
77
Run "make fuzz_testing" and follow the instructions.

‎test/src/unit-algorithms.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
__ _____ _____ _____
33
__| | __| | | | JSON for Modern C++ (test suite)
4-
| | |__ | | | | | | version 2.0.4
4+
| | |__ | | | | | | version 2.0.5
55
|_____|_____|_____|_|___| https://github.com/nlohmann/json
66
77
Licensed under the MIT License <http://opensource.org/licenses/MIT>.

0 commit comments

Comments
 (0)