diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-18 21:11:59 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-18 21:12:39 +0100 |
| commit | c892ceec1c301f12d5c276e12be0bee8fd7d4cbf (patch) | |
| tree | 68632e91c821a80a652b413fe8bd9a7461931812 | |
| parent | 51ab06a84a03a3d11e175f1d681ee620c41b4c20 (diff) | |
| parent | 4d95d64382eefcb50bea5d900989cb24d56bf656 (diff) | |
| download | qtxmlpatterns-c892ceec1c301f12d5c276e12be0bee8fd7d4cbf.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.11v5.11.0-beta2v5.11.0-beta1
Conflicts:
.qmake.conf
Change-Id: Ie22521d6ce234132ebde19dfb91e09203f5fe13d
0 files changed, 0 insertions, 0 deletions