diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-29 11:29:07 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-29 11:29:07 +0200 |
| commit | 3b1da8a7754b37d5767aeb55a7ca46e4180a6109 (patch) | |
| tree | 6748bf907f7751375379318bab45cf1fb8deb107 /src/designer/src/designer/qdesigner_toolwindow.h | |
| parent | 2b062a567c5ab282ce663ac5edf03b2cb56265ce (diff) | |
| parent | 0731b64ee6d3439e6ddfa3ee58a7e909b170ebb0 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/assistant/assistant/doc/src/assistant-manual.qdoc
Change-Id: I136caf5f26eff4d1c2574459b8dff9937c2c372d
Diffstat (limited to 'src/designer/src/designer/qdesigner_toolwindow.h')
0 files changed, 0 insertions, 0 deletions