diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-16 13:22:30 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-16 13:22:30 +0100 |
| commit | aca81bbfdda16003aa67a3d35f5d4ae83496279d (patch) | |
| tree | 5d963f5ea7019d62936aac22ac3f198065bdc64d | |
| parent | 9e741300ae5c706a55f400bbf8d57ccab3280fa1 (diff) | |
| parent | 4cfbe4037ee8f5b1cd96be516cc00c3dbf43c59d (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
.qmake.conf
Change-Id: I33a73b089747a14ceb52027d3d5681c2ec4c8f1b
0 files changed, 0 insertions, 0 deletions