diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:28:42 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:28:42 +0200 |
| commit | 02af08a705ada1ca2dac839a026a816a8e70def5 (patch) | |
| tree | 7921ed3485e5409432025043e3e03820edbb6341 | |
| parent | 2f6074fde0ec050c77f881e0d2ce265fa93a0fcc (diff) | |
| parent | 6dde73718477090251b28aaee5b8049a3cc38293 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-rc1
Conflicts:
src/datavisualization/datavisualization.pro
Change-Id: Iaa51ffb3d2f111595bed4b200cbedd9c2c3b5f34
0 files changed, 0 insertions, 0 deletions