diff options
author | Kari Oikarinen <kari.oikarinen@qt.io> | 2019-09-04 10:05:45 +0300 |
---|---|---|
committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2019-09-04 11:30:02 +0300 |
commit | 03b0cfbd1c220eaea38a91aeb035a943ad1e9d83 (patch) | |
tree | 4a6165d3b2a76d1504f4cb6ae09e6b0bdb8aae3a | |
parent | 79052c5be918a18ca6d02bbf6118088ba3e333a1 (diff) | |
parent | e3771f91b466e356276e703d1a02bfe11f93a29a (diff) |
Merge dev into 5.14 (delayed final downmerge)
This replicates the effects of the fast-forward merge that should have
been pushed on 2019-08-27 as the final down-merge from dev to 5.14.
Task-number: QTBUG-78019
Change-Id: I7a5dceae5cc7bb49978c1323454011d1bfbb4161
0 files changed, 0 insertions, 0 deletions