aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/auto.pro
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2015-02-24 11:54:33 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2015-02-24 11:54:33 +0000
commitdf9fea2ac092b21e96ddf0db235be165cb973bad (patch)
tree82af63ff39b661068f64d87c1eb735d88784343f /tests/auto/auto.pro
parent6e071642fb2698d9636d0d75954b2e1ca17fda16 (diff)
parent098e0c79b0b707771250a421b63a0721f670cdb3 (diff)
Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5v5.5.0-alpha1
Diffstat (limited to 'tests/auto/auto.pro')
0 files changed, 0 insertions, 0 deletions