diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-10 21:36:05 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-10 21:36:05 +0100 |
| commit | 9a1596059d40789f7909e44705d2323bbeb263fe (patch) | |
| tree | 33d712af2d9de78ecd2e8483195e018a2fcc1eb5 | |
| parent | 1baafa8e6f207d6f5ab8b1faaa3c5f7043fe6356 (diff) | |
| parent | c76e2a37310f1e94002488fe33d56d6b00f2d626 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: Ifd0c7a09c5efd6b1cd00d478640777d81c241006
0 files changed, 0 insertions, 0 deletions