diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-05-27 15:10:48 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-05-27 15:11:15 +0200 |
commit | 329b566e931d3f1b0a8dd319d244432cc740ae9e (patch) | |
tree | 06305660998bde374efb5f298b937d6d4bc01d50 /.gitattributes | |
parent | 0681e65ffa4970c01247b705a6774a937756eb08 (diff) | |
parent | 72104d1cb6a1ea5b3c529532f2ad7491d26a89a9 (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0
Change-Id: Ic2a781b2eee93aea5e78ed5442b22d2c8a162988
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions