diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-08-15 12:22:32 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-08-15 13:07:25 +0200 |
| commit | c54adde27f5aa723882ffc5f77fae86b3793b6e2 (patch) | |
| tree | 06b0c81cf0090bd10539b0208a9b1eba41411461 /.gitignore | |
| parent | d8c81e5db3e5aefd87f3f4e552eb791d84ad3d3d (diff) | |
| parent | 3f8ae713dfdbaeb34bdc52d905fe5ca16765cf7f (diff) | |
Merge remote-tracking branch 'origin/5.9' into devv5.10.0-beta1v5.10.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I849ed97b46cf390fd6c5d3017b7e66f7dd9aeeef
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions