diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-02-07 01:35:46 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-02-07 01:35:46 +0100 |
| commit | f0cd88c0d7af9a477bf90545975d289915e89033 (patch) | |
| tree | 40d16da8a9d35a92b72d7612156a606b83dd7a12 /sync.profile | |
| parent | 66487fec4c558d8b77dd0573e524a61d11e33c2a (diff) | |
| parent | 4d0294352f975c3916dfbba48f21e5b76da432c0 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/imports/controls/universal/ToolButton.qml
Change-Id: Ib9f1e7d83fb824d9e6a13a2bc429d1a5642fe4f6
Diffstat (limited to 'sync.profile')
0 files changed, 0 insertions, 0 deletions