diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:25:39 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:25:39 +0100 |
| commit | f0561e640a488fa1870cacaae897133c7fdf6362 (patch) | |
| tree | 144c9f58a85ac7beb24a3b0588e52b460066c74d /.gitattributes | |
| parent | 3f9e924417c13f2026fda503a1620f517370466d (diff) | |
| parent | d94fb02a55705ba913fcf4f871528ea8aee52eaa (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9v5.9.0-beta4v5.9.0-beta3v5.9.0-beta2v5.9.0-beta1
Change-Id: I96aab23702bdd34d365b0f7ce82a4161e3ca3863
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions