diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:08:14 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-07 13:59:14 +0200 |
| commit | c9a4897aa09d723d22b842b1fabcc296bf3c7f91 (patch) | |
| tree | 03acf263859491402be3118cc22a1959bd5a86a6 /tests/auto/qxmlname | |
| parent | a5984f0a63233e0e9608ce8ab66e6d2d0e6948e3 (diff) | |
| parent | 7aad4fb7bcd219badbc19b393b6d0aa6192ac8fe (diff) | |
| download | qtxmlpatterns-c9a4897aa09d723d22b842b1fabcc296bf3c7f91.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: Ieff26ce785aea28ebabdec2aa3364efbd59c1456
Diffstat (limited to 'tests/auto/qxmlname')
0 files changed, 0 insertions, 0 deletions