diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-16 13:25:22 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-16 13:25:22 +0100 |
| commit | a8c1b85b91925a7868eeef1fad9e7d1606473f47 (patch) | |
| tree | 0e06c8e95a3748319475fcf84390dc483491cd50 | |
| parent | 1ad75d1169764b599bd5fe6d1a3d9c1745e9f5cc (diff) | |
| parent | 7b091d13ed5509a73da921a7ed30034a7eb55131 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
.qmake.conf
Change-Id: I88de56f107b431f786e2561d265d476ee8899fb7
0 files changed, 0 insertions, 0 deletions