summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2015-01-19 14:07:01 +0100
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2015-01-19 14:07:01 +0100
commit09a43529393967838a95bd71b99a1861a6b9a61a (patch)
treec7935687cb237a3eb88352155a9c0e0499bd4aed /tests
parent5efb14517ac1f7c97c69924e2e42cab1f7997f9f (diff)
parenta951d6caf120f14dfcde25566158768d759e07d7 (diff)
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts: .qmake.conf Change-Id: Ib87eba614edcfef97f64a224fa336d607eec6ea1
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions