diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-07-31 03:01:36 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2018-07-31 10:57:33 +0200 |
| commit | e95c186fe8da96fba394490f9bca817534124b63 (patch) | |
| tree | 79a2d17b36bea72be1506dc2823097c347136e2d | |
| parent | 124a6c0ba51082e9289be1b9008832fc95186c3d (diff) | |
| parent | dbc1311af757c5acdca034d3632dca3bf1f81af5 (diff) | |
| download | qtxmlpatterns-e95c186fe8da96fba394490f9bca817534124b63.tar.gz | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
Change-Id: I49765ada59c4b616a7354df475413485419404c7
0 files changed, 0 insertions, 0 deletions