summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2015-08-09 15:27:21 +0200
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2015-08-09 15:27:21 +0200
commit66b68ed94032e03b7a0ed9d15f72b1fc5e2cb729 (patch)
treee0093cca956690a272f9415a2743064ec1d3dd71 /examples
parentbe50531985f64089c87289ba0c026007437517a2 (diff)
parent6afc4815a1e20f795591ef7d1452a521920ce0bd (diff)
downloadqtquickcontrols-66b68ed94032e03b7a0ed9d15f72b1fc5e2cb729.tar.gz
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: Ifec0f56816809abb90a294b8462391cb7e54c87d
Diffstat (limited to 'examples')
0 files changed, 0 insertions, 0 deletions