diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-30 03:03:23 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-30 03:03:23 +0100 |
| commit | 3bd008ae85a51cbcfec1e6710271f117a44b3f92 (patch) | |
| tree | f063445d9a69eb349d9dd57e3455308751a2efeb /.gitattributes | |
| parent | add794a5b732608dcd5d99a433f4a61d20838482 (diff) | |
| parent | 52876056ff3dcda97f93932bc8c6e1c0fbce9d5e (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I1d9281750b06f7584e55759994dc6fcbcc5b2455
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions