prepare 6.2.0 release.

Author: jacobwilliams

.VERSION

@@ -1 +1 @@
-6.1.0
+6.2.0

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 - [Change Log](#change-log)
     - [Unreleased](#unreleased)
+    - [6.2.0 (2018-03-10)](#620-2018-03-10)
     - [6.1.0 (2017-11-05)](#610-2017-11-05)
     - [6.0.0 (2017-08-24)](#600-2017-08-24)
     - [5.3.0 (2017-04-07)](#530-2017-04-07)
@@ -24,7 +25,22 @@
 
 ### [Unreleased](https://github.com/jacobwilliams/json-fortran/tree/HEAD)
 
-[Complete Changeset](https://github.com/jacobwilliams/json-fortran/compare/6.1.0...HEAD)
+[Complete Changeset](https://github.com/jacobwilliams/json-fortran/compare/6.2.0...HEAD)
+
+### [6.2.0](https://github.com/jacobwilliams/json-fortran/tree/6.2.0) (2018-03-10)
+
+[Complete Changeset](https://github.com/jacobwilliams/json-fortran/compare/6.1.0...6.2.0)
+or [Download v6.2.0](https://github.com/jacobwilliams/json-fortran/releases/tag/6.2.0)
+
+**Enhancements:**
+
+- Allow the unit tests to be run from within the Visual Studio solution [\#295](https://github.com/jacobwilliams/json-fortran/issues/295) ([Hugh-walsh](https://github.com/Hugh-walsh), [jacobwilliams](https://github.com/jacobwilliams))
+- Compiling now works for the CMake-produced Visual Studio solution on Windows (note that the CMake-produced solution is a bit different from the other one provided). [\#70](https://github.com/jacobwilliams/json-fortran/issues/70) [\#309](https://github.com/jacobwilliams/json-fortran/pull/309) ([handrake0724](https://github.com/handrake0724), [jacobwilliams](https://github.com/jacobwilliams))
+- Added a new option `escape_solidus` to specify if the forward slash ("`/`") is to be escaped when serializing JSON. By default, it is no longer escaped (this changes the behavior introduced in 6.0.0) [\#304](https://github.com/jacobwilliams/json-fortran/issues/304) [\#305](https://github.com/jacobwilliams/json-fortran/pull/305) ([jacobwilliams](https://github.com/jacobwilliams))
+
+**Fixed issues:**
+
+- Fixed an issue causing a problem with the NAG compiler [\#303](https://github.com/jacobwilliams/json-fortran/issues/303) ([jacobwilliams](https://github.com/jacobwilliams))
 
 ### [6.1.0](https://github.com/jacobwilliams/json-fortran/tree/6.1.0) (2017-11-05)
 

README.md

@@ -96,8 +96,7 @@ Currently, several ways are provided to build the JSON-fortran library
 
 * A [CMake](http://www.cmake.org) build
 system is provided. This build system has been tested on Mac and Linux
-using the Intel Fortran Compiler, gfortran 4.9, and NAG Fortran 6.0. It has not been
-tested on Windows. This CMake based build provides an install target,
+using the Intel Fortran Compiler, gfortran 4.9, and NAG Fortran 6.0. It does also work on Windows (but note that the Visual Studio project it generates is not quite the same as the one mentioned above). This CMake based build provides an install target,
 and exports from both the install location and the build location so
 that building and using JSON-Fortran in another CMake based project is
 trivial. To get started with the CMake based build, set the
@@ -114,7 +113,7 @@ cmake_minimum_required ( VERSION 2.8.8 FATAL_ERROR )
 enable_language ( Fortran )
 project ( jf_test NONE )
 
-find_package ( jsonfortran-${CMAKE_Fortran_COMPILER_ID} 6.1.0 REQUIRED )
+find_package ( jsonfortran-${CMAKE_Fortran_COMPILER_ID} 6.2.0 REQUIRED )
 include_directories ( "${jsonfortran_INCLUDE_DIRS}" )
 
 file ( GLOB JF_TEST_SRCS "src/tests/jf_test_*.f90" )

pages/releases/index.md

@@ -25,6 +25,9 @@ documentation from the documentation for official releases other than
 using the browser's back button. Feel free to bookmark this page, or
 the [main project page](|url|/index.html) for convenient navigation.
 
+* [6.2.0](http://jacobwilliams.github.io/json-fortran/6.2.0/index.html)
+   ([FORD](https://github.com/cmacmackin/ford) generated documentation)
+    - [Download](https://github.com/jacobwilliams/json-fortran/releases/tag/6.2.0)
 * [6.1.0](http://jacobwilliams.github.io/json-fortran/6.1.0/index.html)
    ([FORD](https://github.com/cmacmackin/ford) generated documentation)
     - [Download](https://github.com/jacobwilliams/json-fortran/releases/tag/6.1.0)