summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2016-02-15 19:04:30 +0100
committerLiang Qi <liang.qi@theqtcompany.com>2016-02-15 19:04:30 +0100
commit67041bbc667a10ae14a15ed8755b2b1bbf91b686 (patch)
tree5e60cba6d8782dddaf82a4281e8ea065e89714ac
parentd9445e92d2f4395d1f80185fb43da54f87811298 (diff)
parent24f7b001be872982bc675bf065419f1bcc76f87b (diff)
downloadqtquickcontrols-67041bbc667a10ae14a15ed8755b2b1bbf91b686.tar.gz
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: I196db88d242bc270c21282d152b949d737232650
0 files changed, 0 insertions, 0 deletions