Skip to content

Commit

Permalink
Merge branch 'master' into v5
Browse files Browse the repository at this point in the history
  • Loading branch information
gempa-jabe committed Jul 12, 2022
2 parents 34d65fd + d6b8e59 commit d05302f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

All notable changes to SeisComP are documented here.

## 5.1.1

- The release did not contain the latest advertised changes of the main
repository. This version does not introduce any new features or bugfixes.

## 5.1.0

- scbulletin
Expand Down
2 changes: 1 addition & 1 deletion src/system/libs/seiscomp/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

#define SEISCOMP_VERSION_MAJOR 5
#define SEISCOMP_VERSION_MINOR 1
#define SEISCOMP_VERSION_PATCH 0
#define SEISCOMP_VERSION_PATCH 1

#define SEISCOMP_VERSION ((SEISCOMP_VERSION_MAJOR << 0x10) |\
(SEISCOMP_VERSION_MINOR << 0x08) |\
Expand Down

0 comments on commit d05302f

Please sign in to comment.