diff options
| author | Kari Oikarinen <kari.oikarinen@qt.io> | 2019-09-04 11:51:27 +0300 |
|---|---|---|
| committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2019-09-04 11:51:27 +0300 |
| commit | adfea3dee38c03df8cb68eaefb77907902d910ca (patch) | |
| tree | 8e0470f057143e5a1c36791d83b42af9729b1745 /.gitattributes | |
| parent | dd56d0fd8b45566c491ef30624177919eee621b4 (diff) | |
| parent | 98f28af44fdd3c63f1c05251826d7cb87a1142c8 (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: I999b90d6b89b967c7cc94b7d0259b0ecda5de7ae
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions