diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:35:36 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:35:36 +0200 |
| commit | e2e7b57a5d3f3fe870756f4cdcf104b7090c3526 (patch) | |
| tree | 054ecad42b11859c95956fc9b10743e221f1ac08 /.gitattributes | |
| parent | b49bfdaad11be1de632f907d43485a7ac701ddc5 (diff) | |
| parent | 95333d804470dac6d529fc68d5dc5bfb7fa30ffe (diff) | |
| download | qtscript-5.7.0.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-rc1v5.7.05.7.0
Conflicts:
.qmake.conf
Change-Id: I59a0b27e74c2a4d9d62727e067abcdaf0fb97e8b
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions