summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2014-11-21 16:12:09 +0100
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2014-11-21 16:12:09 +0100
commit414dee3c6fa231f5af48178cf5b8021a99514526 (patch)
tree6e2fc5059ccc9a2d5b3117c521fa9f6f49d5ddbe /examples
parentaf7176e54da156a2ac3a52157e47d70cea27352c (diff)
parentae5216a58b3f2a5fb2ca6031f28e6fe9d66bd59d (diff)
downloadqtactiveqt-414dee3c6fa231f5af48178cf5b8021a99514526.tar.gz
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I78af1c606fb7a620559a47cb5369dd98004834de
Diffstat (limited to 'examples')
0 files changed, 0 insertions, 0 deletions