diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:32:15 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:32:15 +0100 |
| commit | 5b5da71586c8391fd74415ec9241c13489445b2a (patch) | |
| tree | aebe3b95f7edd823e7dc38f54aae08e9c1bdf87d /src/xmlpatterns/data/qgday.cpp | |
| parent | ccde017309249a01e67cae0f2b89b3ae4285ca4d (diff) | |
| parent | 95b629b30380be3de92158ad55ba266452d3c945 (diff) | |
| download | qtxmlpatterns-5b5da71586c8391fd74415ec9241c13489445b2a.tar.gz | |
Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I12424435f2a4c4f2b582c7acad18e0c57dfbd554
Diffstat (limited to 'src/xmlpatterns/data/qgday.cpp')
0 files changed, 0 insertions, 0 deletions