diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-04 16:12:46 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-04 16:12:46 +0200 |
| commit | 5a3dfff47a44e6507d065961f9a495bc735214cb (patch) | |
| tree | 875327922f54e31a1f818e7b90536500305da3fe /tests | |
| parent | c040a176aabdd4865aa41965b77c2f85acd2c431 (diff) | |
| parent | 7c6fe312b00760626035051131a857aa47b4bd68 (diff) | |
| download | qtxmlpatterns-5a3dfff47a44e6507d065961f9a495bc735214cb.tar.gz | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
Change-Id: I4e12c0fbbaa0449bdd3b9fd3ad4beac5ea245d1f
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions