Merge branch 'directory-layout'

CHANGELOG.md

@@ -3,14 +3,14 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 This file is inspired by [Keep a `CHANGELOG`](http://keepachangelog.com/).
 
-## [Unreleased]
+## [6.1.0]
 ### Added
 - `Make exports` which outputs shell `export` commands (to avoid global installation)
 
 ### Changed
 - More conventional directory layout (#4)
 
-## [6.0.0] - 2016-01-04
+## [6.0.1] - 2016-01-04
 ### Fixed
 - Bug in implementation of [WB6](http://unicode.org/reports/tr29/#WB6)
 - Special case U+0020 SPACE ' ' as a graphic character
@@ -35,7 +35,8 @@ This file is inspired by [Keep a `CHANGELOG`](http://keepachangelog.com/).
 ### Fixed
 - Compiles on modern OS X and Ubuntu
 
-[Unreleased]: https://github.com/eddieantonio/isri-ocr-evaluation-tools/compare/v6.0.1...HEAD
+[Unreleased]: https://github.com/eddieantonio/isri-ocr-evaluation-tools/compare/v6.1.0...HEAD
+[6.1.0]: https://github.com/eddieantonio/isri-ocr-evaluation-tools/compare/v6.0.1...v6.1.0
 [6.0.1]: https://github.com/eddieantonio/isri-ocr-evaluation-tools/compare/v6.0.0...v6.0.1
 [6.0.0]: https://github.com/eddieantonio/isri-ocr-evaluation-tools/compare/v5.1.3...v6.0.0
 [5.1.3]: https://github.com/eddieantonio/isri-ocr-evaluation-tools/compare/v5.1.0...v5.1.3

src/isri_version.h

@@ -1,3 +1,3 @@
 #define ISRI_VERSION_MAJOR "6"
-#define ISRI_VERSION_MINOR "0"
+#define ISRI_VERSION_MINOR "1"
 #define ISRI_VERSION ISRI_VERSION_MAJOR "." ISRI_VERSION_MINOR