diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-30 11:06:30 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-30 11:06:30 +0100 |
| commit | b45d63e028345956256740307f2788b387188e1f (patch) | |
| tree | ffc09d05e0c5a2d5fcbb6d8f3cf789998b643ee4 /LICENSE.GPL2 | |
| parent | a3ab5864425532fcfe44979381db7ce772ea22e2 (diff) | |
| parent | b8c12ed8b1287462b897de76b7a9ad3ff5cc2194 (diff) | |
| download | qtxmlpatterns-b45d63e028345956256740307f2788b387188e1f.tar.gz | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
.qmake.conf
Change-Id: Ieec8f7e562fc4c246a336402985cdb60f36b172f
Diffstat (limited to 'LICENSE.GPL2')
0 files changed, 0 insertions, 0 deletions