Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/FelixPetriconi/libraries
Browse files Browse the repository at this point in the history
…into develop

# Conflicts:
#	CHANGES.md
  • Loading branch information
FelixPetriconi committed Oct 25, 2018
2 parents 1951fdd + f51c58b commit e582a56
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
- [#154](https://github.com/stlab/libraries/issues/154) : Compilation error with gcc
- Race condition in timed blocking_get

- Enhancements:
- Add cmake support as library (Many thanks to Austin McCartney!)

- Enhancements
- The library can now be included as cmake dependency (Many thanks to Austin McCartney)
## v1.3.2 - 2018 - July - 28

- Fixed Issues
Expand Down

0 comments on commit e582a56

Please sign in to comment.