diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-11 03:00:46 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-11 03:00:46 +0200 |
commit | 7320188f253b8a382a03dba170ae47deec0425e5 (patch) | |
tree | 292c2463ea9ba675dc91197c4a13e16e30d2b7fd /.gitattributes | |
parent | eea291d2a53ed1e390baa9ed1ca59fb764b8b4ad (diff) | |
parent | f305948c23f631ddce3e49c4bd90149997c0903c (diff) |
Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-alpha1
Change-Id: Ic54b1a747b4cab6b293aa9933bff2c6b6dc3d037
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions