diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-30 21:10:05 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-30 21:10:14 +0100 |
| commit | 908d1caf6b3ca74dc7b03229809a9b7802433e43 (patch) | |
| tree | 866306b7a1063ceb4b2464ca7b583ab19933f054 /.gitignore | |
| parent | d7e294ded23240d62f662579eeed733e6b981d60 (diff) | |
| parent | 33ab1d454b1a87cd2e44c185c640565edfc73e38 (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6.0
Change-Id: Iaa0f274e35fd48dc6767a458fd0ee24c8b48e87a
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions