diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-22 09:29:24 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-22 09:29:24 +0100 |
| commit | db07dbbd51a9c7f8789a772cf98bdecf2887cd78 (patch) | |
| tree | 8c6edc785b80e373983c85808cb4e3ce86e58fe8 | |
| parent | 750f359fd7aa47775abefce2d2aa8ec423745622 (diff) | |
| parent | 50f6698117c2259bdd78868620908eec79e09561 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: Ie953fa849567ba6f518f1f309d14643c994bbc43
0 files changed, 0 insertions, 0 deletions