diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-09 03:06:21 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-11 15:22:22 +0200 |
| commit | 9dbbcb34a0393f5cd39b741917cd4f131008cf58 (patch) | |
| tree | e598a7c5b7d0e4a27b0455dcb4064a7567ebd03e | |
| parent | d32c85cafa29001ada3f7515a9b8f2d76164193a (diff) | |
| parent | 0e1ee397fe97d06b946e6fa296378721496ba3e5 (diff) | |
| download | qtxmlpatterns-9dbbcb34a0393f5cd39b741917cd4f131008cf58.tar.gz | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
.qmake.conf
Change-Id: I7b4a6b4ec0b51cd9438daa17900eb46664db715f
0 files changed, 0 insertions, 0 deletions