diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-09 03:06:13 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-11 14:41:12 +0200 |
| commit | c314bf8e4b021ca928b88132ef1cd376b5d482d2 (patch) | |
| tree | a256552f7e0b26c234115f43b53adb561ec8b1f0 /.gitattributes | |
| parent | 0e1ee397fe97d06b946e6fa296378721496ba3e5 (diff) | |
| parent | 1fe82f967320b3c65f29ed704862f8c34a6c0c87 (diff) | |
| download | qtxmlpatterns-c314bf8e4b021ca928b88132ef1cd376b5d482d2.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: Icb9c69298452f55c0816fca75b79c0f041c9d8cf
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions