summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@theqtcompany.com>2016-04-06 11:11:41 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2016-04-06 11:11:41 +0000
commit5aa96caa3c602367a61b613a5810f13cf2502464 (patch)
tree210b9a86f366689336a320893ab6a92425524bdb /examples
parentbd2404d3e7fb2a043db56bd3df6d9e631613336e (diff)
parent887f86794c24c6e80cf49a2687b669d7530a1944 (diff)
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
Diffstat (limited to 'examples')
0 files changed, 0 insertions, 0 deletions