Merge branch 'develop' into feature/travis-cmake

This commit is contained in:
Peter Dimov 2019-12-29 16:39:33 +02:00
commit abd5ae931a
2 changed files with 2 additions and 2 deletions

@ -1 +1 @@
Subproject commit 03d92967f949a0b4a94d572795d1391c93a0199f
Subproject commit 5761c469850da98ba43b01d91672f929c807a1d7

@ -1 +1 @@
Subproject commit b977e3de04d50ed4d035ba738c544b5c58f760d3
Subproject commit 0e3447fed3a452dd1353373216d898633d67213a