Merge branch 'master' into develop

2019-02-17 19:50:20 +01:00 · 2019-02-17 19:50:20 +01:00 · 5c6ed8191b
commit 5c6ed8191b
parent bb06f17de0 c438d96668
1 changed files with 1 additions and 0 deletions
--- a/conanfile.txt
+++ b/conanfile.txt
@ -10,3 +10,4 @@ cmake
 [options]
 protobuf:shared=False
 qt:qttools=True
+qt:qttranslations=True