aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/qmldir
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2016-12-20 16:51:31 +0100
committerJ-P Nurmi <jpnurmi@qt.io>2016-12-20 16:51:54 +0100
commit8148e5338de3c8d307f758c9ffcf1f7309fd48bd (patch)
tree8c33cf73c8d83a0a77154a03ee0152e55d88b74e /src/imports/controls/qmldir
parent74b6f1705a237f426fdef530b46dde474d335095 (diff)
parentd0ba7b41f27fbfac366930a5e92b80e530b39630 (diff)
Merge remote-tracking branch 'origin/5.8.0' into 5.8
Diffstat (limited to 'src/imports/controls/qmldir')
0 files changed, 0 insertions, 0 deletions