summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2014-01-08 15:51:02 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-08 15:51:02 +0100
commitaf9910e450ae0374cb4d1479d416469c9f800b73 (patch)
tree5280cc9f7ae8ddecbc4dd387d078d625a0bd2015 /tests/auto
parent635bfd66068269547575115c2a46c6a5e1ddac36 (diff)
parentc8046f7d42b565e7fc02aa6228c72eee5ab51605 (diff)
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'tests/auto')
0 files changed, 0 insertions, 0 deletions