Merge branch 'master' into develop

feature/qt-as-conan-package
Michael Mandl 2019-01-29 14:03:47 +01:00
commit 8a0d2822fe
1 changed files with 1 additions and 0 deletions

View File

@ -1,5 +1,6 @@
[requires]
protobuf/3.6.1@bincrafters/stable
protoc_installer/3.6.1@bincrafters/stable
catch2/2.4.2@bincrafters/stable
[generators]