diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 19:50:57 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 19:50:57 +0200 |
| commit | 46d18a2498cd4acacb952aeb9eebe5e0457ffa1a (patch) | |
| tree | 03cd0b1929263a244f373d714ac3220ee2cc54bf /.gitignore | |
| parent | 44e67c8c7ee0c82156a43d5088dc97c9b0f47ffc (diff) | |
| parent | 2eb5decb8245a7e93c4901872d21306b34dc018d (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: I0a3675f9b7cc2858be8807e778588df09adc8d7d
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions