summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-06-09 11:15:41 +0200
committerLiang Qi <liang.qi@qt.io>2016-06-09 11:15:41 +0200
commitfedd1638e9106680354d0d63de3f88589984f41c (patch)
treefc84bb1ed1388cad1e6665362502b408cc55a816 /src
parent7e33119c487b6ce7ee1b7e8fc7b9b862adba1c91 (diff)
parentfcc9c0206433c5c940a0872447899743d1a9996a (diff)
downloadqtquickcontrols-fedd1638e9106680354d0d63de3f88589984f41c.tar.gz
Merge remote-tracking branch 'origin/5.6.1' into 5.6
Change-Id: I9d0eb301403bb785ab40120463c0ad184d1af7be
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions