diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-24 03:04:34 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-24 03:04:34 +0200 |
| commit | ff8ac61c5ddab365fbed5b1534be05d79d9e978a (patch) | |
| tree | 78fd2291314ae1407aa310567c88ab67248e750a /.gitattributes | |
| parent | d234e25d530f19979fbfc4b4fea73277358a0a39 (diff) | |
| parent | 04c23a295d757c43c16f911fd25c912a78b57b62 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I466a4eec6c2aa74f560f4a2acf01d0f84ec328ff
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions