Merge branch '1.0'
authorMilian Wolff <milian.wolff@kdab.com>
Wed, 22 Feb 2017 12:40:40 +0000 (13:40 +0100)
committerMilian Wolff <milian.wolff@kdab.com>
Wed, 22 Feb 2017 12:40:40 +0000 (13:40 +0100)
commite5554a0a304d3b59085c7f00c6ad00fd917af8b8
tree9d9142918046816f8acefbf57c6e30c34f8b5757
parent7d1098c124c5033e28b2e8f6b94e955d1d873fa6
parent65c7cac9817880bce4608fca747dbab52239c3fb
Merge branch '1.0'