Skip to content

Commit

Permalink
Release v2.15.6
Browse files Browse the repository at this point in the history
  • Loading branch information
joto committed Jun 27, 2020
1 parent 378305f commit 1bd2059
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 4 deletions.
12 changes: 11 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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}")
Expand Down
4 changes: 2 additions & 2 deletions include/osmium/version.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 1bd2059

Please sign in to comment.