summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2014-10-14 13:54:37 +0200
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2014-10-14 13:54:37 +0200
commitf148011ba91aca5df4efe90124d4c61da4b802f7 (patch)
treeac07c80562c1a20c4ec997477bf3a620ab29189c /examples
parent21b122f10628b22d71ced28146277258552736e2 (diff)
parentb08e807252db3dc64ce135a591b939811534aa7d (diff)
downloadqtactiveqt-f148011ba91aca5df4efe90124d4c61da4b802f7.tar.gz
Merge remote-tracking branch 'origin/5.3' into 5.4
Change-Id: Icb9ffc6e896998c39117bf8ae345902968b9e001
Diffstat (limited to 'examples')
0 files changed, 0 insertions, 0 deletions