diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-09 03:03:46 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-11 14:23:36 +0200 |
| commit | 96f9f3db3fb7f8f5a21aaebd0be72d3f110428c7 (patch) | |
| tree | 0558d8774bf1f72ea31561f9004f298efb3ddcac | |
| parent | 4258ea1cf66f3b4e710b05c87b77622c7115284b (diff) | |
| parent | 1dda855cfc82db70fd937b1c33f9af57482a5d43 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: Ice1d45d16682d0af473821396d9ba09f35ec4a98
0 files changed, 0 insertions, 0 deletions