diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-22 09:30:39 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-22 09:30:39 +0100 |
| commit | 8a6aecd783304ced48e17fc68091ec4e8664d2df (patch) | |
| tree | aeb838387527807bbe9907eea828b8c1dd6384d8 | |
| parent | 29e31fad480e097d7cca121c44fc16028ac3ffa9 (diff) | |
| parent | 64c479e151557343a1ffc684e2ba76c9ef97b1f9 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: I14fd028c3d790fc6bb843d645441dfe31a1ded94
0 files changed, 0 insertions, 0 deletions