diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-22 09:31:08 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-22 09:31:08 +0100 |
| commit | d9863f5c818fe867192d29bd8bed54784f405cf7 (patch) | |
| tree | 7eeed972bac7aa5a8a3cc502a36ddaee387f88bb | |
| parent | ba94889c325841c244f401f68267d0450d3ca444 (diff) | |
| parent | 45bc3ab0bbc292be26b2bf0596487d9c7f2059d3 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: I5e399965c268c2cd7c5dd0828729a6fbd6d97795
0 files changed, 0 insertions, 0 deletions