From 2282c8450bae55839372a2002db7ca754530d2fc Mon Sep 17 00:00:00 2001 From: Jochen Topf Date: Mon, 22 Feb 2016 11:39:08 +0100 Subject: [PATCH] Release v2.6.1 --- CHANGELOG.md | 16 ++++++++++++---- CMakeLists.txt | 2 +- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a6048ce5..394644890 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,19 +8,26 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Added +### Changed + +### Fixed + + +## [2.6.1] - 2016-02-22 + +### Added + - Add `WITH_PROFILING` option to CMake config. When enabled, this sets the `-fno-omit-frame-pointer` compiler option. ### Changed -- Massiv speed improvements when building multipolygons. +- Massive speed improvements when building multipolygons. - Uses (and includes) new version 1.3.0 of protozero library. - Removed dependency on Boost Iterator for PBF writer. - Example program `osmium_area_test` now uses `cerr` instead of `cout` for debug output. -### Fixed - ## [2.6.0] - 2016-02-04 @@ -269,7 +276,8 @@ This project adheres to [Semantic Versioning](http://semver.org/). Doxygen (up to version 1.8.8). This version contains a workaround to fix this. -[unreleased]: https://github.com/osmcode/libosmium/compare/v2.6.0...HEAD +[unreleased]: https://github.com/osmcode/libosmium/compare/v2.6.1...HEAD +[2.6.1]: https://github.com/osmcode/libosmium/compare/v2.6.0...v2.6.1 [2.6.0]: https://github.com/osmcode/libosmium/compare/v2.5.4...v2.6.0 [2.5.4]: https://github.com/osmcode/libosmium/compare/v2.5.3...v2.5.4 [2.5.3]: https://github.com/osmcode/libosmium/compare/v2.5.2...v2.5.3 diff --git a/CMakeLists.txt b/CMakeLists.txt index 0e2947b9b..bc9b12ea5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,7 +25,7 @@ project(libosmium) set(LIBOSMIUM_VERSION_MAJOR 2) set(LIBOSMIUM_VERSION_MINOR 6) -set(LIBOSMIUM_VERSION_PATCH 0) +set(LIBOSMIUM_VERSION_PATCH 1) set(LIBOSMIUM_VERSION "${LIBOSMIUM_VERSION_MAJOR}.${LIBOSMIUM_VERSION_MINOR}.${LIBOSMIUM_VERSION_PATCH}")