diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-22 09:30:42 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-22 09:30:42 +0100 |
| commit | ea47c7435d4756d52fd36e4986af6c97c70f4162 (patch) | |
| tree | 34d643c3279a1205b9414dd6eb12c0f0a6d3bdc2 | |
| parent | f1812309c36ce1e2a7c6b59381424b803cf37068 (diff) | |
| parent | 4e7e9fc7bcc97e9278b25ecb35e6798c2ca229d6 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: I23320a7a1c4d514a3fca592c24e1436b4b13f8d4
0 files changed, 0 insertions, 0 deletions