summaryrefslogtreecommitdiffstats
path: root/.gitattributes
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-07-09 03:05:18 +0200
committerEdward Welbourne <edward.welbourne@qt.io>2019-07-11 14:38:38 +0200
commitaa450db462db5fca847ed05c1e05c1779161cc8b (patch)
treed352216175ffd65e71408baec405890c6dabf458 /.gitattributes
parent9b881eb5ec194e481335b15b66d6579993d68122 (diff)
parent0a59e25ad454d786cbd24cb55cdb6a0d1484fc66 (diff)
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions