diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-10 21:34:39 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-10 21:34:39 +0100 |
| commit | 8a638d510db90364cef990e770b84f372bde9f6b (patch) | |
| tree | dbb3833a7e0c1011036ed43987d56b6874a70cbe /features | |
| parent | 88af49bdfe4e87d1832240a65d842e9126b7bb63 (diff) | |
| parent | 1e29215b2e40a38b9324a719888749e12a74e99c (diff) | |
| download | qtwayland-8a638d510db90364cef990e770b84f372bde9f6b.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: I5f8ba96b550b6d326a097fce33863caed01c05d1
Diffstat (limited to 'features')
0 files changed, 0 insertions, 0 deletions