diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-18 18:04:43 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-18 18:09:19 +0100 |
| commit | 0a84ad44ff5b793316485fd992326627a70fda84 (patch) | |
| tree | 35897bc5cc38b7bfafbfc7e5b1bc9cce4f1c7517 /.gitignore | |
| parent | 73823fa61d96303cbc6761908e0f4fac7ed5ebb6 (diff) | |
| parent | c3ef9c68cefc4fd323e34f1dcf0314d385a70e23 (diff) | |
| download | qtxmlpatterns-0a84ad44ff5b793316485fd992326627a70fda84.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
.qmake.conf
Change-Id: Id91fb508787683912928d16ac54e18b30eed0f18
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions