diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-14 10:49:51 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-14 10:49:51 +0100 |
| commit | 12e82111ab86669969430ab10118236d8d846d33 (patch) | |
| tree | fb2345160fbe9d46cb61212f4a5eac81389464ba /.gitattributes | |
| parent | 30635ee2424dbd08bb5c2170be0c2dc5f9d23b2c (diff) | |
| parent | 77e0dc0485953427320ed0b442ba24eef4f9d73b (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I0ec164ce6e8099e6e4d6b40a3c7340737473ef4b
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions