Skip to content

Commit

Permalink
Merge pull request #117 from FelixPetriconi/develop
Browse files Browse the repository at this point in the history
Bump patch release
  • Loading branch information
FelixPetriconi authored Dec 13, 2017
2 parents c0f9da6 + 4162578 commit eac93e4
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
6 changes: 6 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## v1.1.1 - 13 December 2017

- Fixed Issues
- [#113](https://github.com/stlab/libraries/issues/113) : Reduction does not appear to work for failed futures; Many thanks to Frans-Willem!
- [#115](https://github.com/stlab/libraries/issues/115) : Version number is forgotten in version.hpp?

## v1.1 - 28 November 2017

- Fixed Issues
Expand Down
4 changes: 2 additions & 2 deletions stlab/version.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
// STLAB_VERSION / 100 % 1000 is the minor version
// STLAB_VERSION / 100000 is the major version

#define STLAB_VERSION 100000
#define STLAB_VERSION 100101

//
// STLAB_LIB_VERSION must be defined to be the same as STLAB_VERSION
// but as a *string* in the form "x_y[_z]" where x is the major version
// number, y is the minor version number, and z is the patch level if not 0.

#define STLAB_LIB_VERSION "1_00"
#define STLAB_LIB_VERSION "1_1_1"

#endif

0 comments on commit eac93e4

Please sign in to comment.