Merge branch 'develop'

2018-11-21 18:15:39 +01:00 · 2018-11-21 18:15:39 +01:00 · 4c7285a64a
parent a444551e6d 611e34fc5e
commit 4c7285a64a
1 changed files with 1 additions and 1 deletions
--- a/conanfile.txt
+++ b/conanfile.txt
@ -5,4 +5,4 @@ protobuf/3.6.1@bincrafters/stable
 cmake

 [options]
-protobuf:shared=True
+protobuf:shared=False