summaryrefslogtreecommitdiffstats
path: root/.gitattributes
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-10-02 03:00:40 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-10-02 03:00:40 +0200
commitbd9f0b27169dcbc3f8bb3914d3e21b1daddeeee5 (patch)
tree1f5e47f964305272ce387f865e924f46f6b4d247 /.gitattributes
parent3ad4866256e9efdc313ac557326c2796dfac8dfb (diff)
parentb90ea4a947a5fe808cba8a12e3c9e9864ffdaa20 (diff)
Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-beta3v5.12.0-beta2
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions