diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 19:51:38 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 19:51:38 +0200 |
| commit | 318159c8492883d7ef29804a68c398cceaa5f89a (patch) | |
| tree | 0ff2aa045f10b54438242d83102d588a89ef020c /.gitignore | |
| parent | b0a50235bc8b59896478e7b238dbeb463f948863 (diff) | |
| parent | d50a09965ae53e02caabdbcf4994ed9bc0ea3293 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: Ia6a6b6fce7aeca446b5e87ff72076fb8be2ada04
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions