diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-04 16:12:19 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-04 16:12:19 +0200 |
| commit | f250ae74f2bad8895f7b89b13c417bac89bbc224 (patch) | |
| tree | ef4e0f0bec050e56c6fa2b1223aee3b20c8f3636 | |
| parent | a4b099e4879a28f22b420fa5e551fc805e08bd6f (diff) | |
| parent | 914077162f24e6194f004b9bb75d2fc19bb8b950 (diff) | |
| download | qtx11extras-f250ae74f2bad8895f7b89b13c417bac89bbc224.tar.gz | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
Change-Id: Ie6db682d14c1a14cda19c1628ebfd12489dea8f8
0 files changed, 0 insertions, 0 deletions