summaryrefslogtreecommitdiff
path: root/src/qtdiag/qtdiag.h
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-11-04 11:27:59 +0100
committerLiang Qi <liang.qi@qt.io>2016-11-04 11:30:39 +0100
commit21c61b26bfb7d6bafac848effd0a169db48ad991 (patch)
tree4506020e9c61afd641a442b71e33ef661bab847e /src/qtdiag/qtdiag.h
parentae9472a39327ce5d5d6735308bd2aef272771391 (diff)
parentb5cb222357841b8dad6fc80aa8e6e88047f20c00 (diff)
downloadqttools-21c61b26bfb7d6bafac848effd0a169db48ad991.tar.gz
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I4ee208f69bed72c480c636cb18f22fd88c02d1e5
Diffstat (limited to 'src/qtdiag/qtdiag.h')
0 files changed, 0 insertions, 0 deletions