diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-09 03:07:15 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-11 11:37:06 +0200 |
| commit | 3cd4fcbf4b2f6ff7bd2e76f7a76db2a931b62944 (patch) | |
| tree | 5cb8a0f4872c30e91e8796537f4173efd1adf3ee | |
| parent | b7a622cac9a5de26cd61203ee6dda6105826d293 (diff) | |
| parent | de7e4c93c0f17e4608abad31bf7cba06b8fc2e19 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: Ie4aa60e1b5e9e227263b24734d1536c09409c610
0 files changed, 0 insertions, 0 deletions