diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e2d359a1..8f9154b5b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,15 @@ This project adheres to [Semantic Versioning](https://semver.org/). ### Added +### Changed + +### Fixed + + +## [2.15.6] - 2020-06-27 + +### Added + * Add `IdSetSmall::merge_sorted` function. ### Changed @@ -1023,7 +1032,8 @@ This project adheres to [Semantic Versioning](https://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.15.5...HEAD +[unreleased]: https://github.com/osmcode/libosmium/compare/v2.15.6...HEAD +[2.15.6]: https://github.com/osmcode/libosmium/compare/v2.15.5...v2.15.6 [2.15.5]: https://github.com/osmcode/libosmium/compare/v2.15.4...v2.15.5 [2.15.4]: https://github.com/osmcode/libosmium/compare/v2.15.3...v2.15.4 [2.15.3]: https://github.com/osmcode/libosmium/compare/v2.15.2...v2.15.3 diff --git a/CMakeLists.txt b/CMakeLists.txt index 55e7743dd..c698acb03 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,7 +40,7 @@ project(libosmium) set(LIBOSMIUM_VERSION_MAJOR 2) set(LIBOSMIUM_VERSION_MINOR 15) -set(LIBOSMIUM_VERSION_PATCH 5) +set(LIBOSMIUM_VERSION_PATCH 6) set(LIBOSMIUM_VERSION "${LIBOSMIUM_VERSION_MAJOR}.${LIBOSMIUM_VERSION_MINOR}.${LIBOSMIUM_VERSION_PATCH}") diff --git a/include/osmium/version.hpp b/include/osmium/version.hpp index ebb2c15e1..c83af2b03 100644 --- a/include/osmium/version.hpp +++ b/include/osmium/version.hpp @@ -35,8 +35,8 @@ DEALINGS IN THE SOFTWARE. #define LIBOSMIUM_VERSION_MAJOR 2 #define LIBOSMIUM_VERSION_MINOR 15 -#define LIBOSMIUM_VERSION_PATCH 5 +#define LIBOSMIUM_VERSION_PATCH 6 -#define LIBOSMIUM_VERSION_STRING "2.15.5" +#define LIBOSMIUM_VERSION_STRING "2.15.6" #endif // OSMIUM_VERSION_HPP