diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-10 21:33:27 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-10 21:33:27 +0100 |
| commit | 4a86aa5243c7f0bde37fe6094ecb4bc7a9da1721 (patch) | |
| tree | 0ca811486cb394028625c30858b0416022203a1b | |
| parent | 1b2e311b34b087ab99048e4064176c630fd1a730 (diff) | |
| parent | 9ab15db10215cef84a58a57411f1d27f83aa4b66 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: I0d60e376037397944bc541b25d75ac52e221df62
0 files changed, 0 insertions, 0 deletions