diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-19 14:07:23 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-19 14:07:23 +0100 |
| commit | 760a3fde6b4b9cfad93d1978540d74418ee9d23c (patch) | |
| tree | 4c714ee6f9fb84b737268a38f2f183b9b1059e29 /tests/global | |
| parent | e2d4b998db7b9f12d47f9ae83e411e4c66fdd49f (diff) | |
| parent | c3d78665b7720aa692173410146db3182e981c87 (diff) | |
| download | qtsvg-760a3fde6b4b9cfad93d1978540d74418ee9d23c.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
Change-Id: I309781379da78578437ecb83a9b878c69c90f559
Diffstat (limited to 'tests/global')
0 files changed, 0 insertions, 0 deletions