diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-05 07:32:16 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-05 07:32:16 +0100 |
| commit | 8bb4665cccbe0b00cf234917e4fd59394705f46f (patch) | |
| tree | 89fb06ef5809243f14ae72cacfaa1ad1bf95a98d /src/xmlpatterns/api/qcoloroutput.cpp | |
| parent | 19e10651830d91dba06f51f8ca7849b5096cea05 (diff) | |
| parent | 74c5be960cbd4709cd8e4dee897cf53c00838128 (diff) | |
| download | qtxmlpatterns-8bb4665cccbe0b00cf234917e4fd59394705f46f.tar.gz | |
Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3
Conflicts:
.qmake.conf
Change-Id: I5f2c272ee2c34387b7ef5169dc553cec14f1db80
Diffstat (limited to 'src/xmlpatterns/api/qcoloroutput.cpp')
0 files changed, 0 insertions, 0 deletions