diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-03-17 16:37:25 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-03-17 16:37:25 +0100 |
| commit | c3edc76d7c621ddd9015eb9992415be34cf36112 (patch) | |
| tree | 0c3992e27bc7458051a9de162f3830b56c818a3d /LICENSE.GPL2 | |
| parent | 01209b22bb7cbb6a18314530e1af8088d30b6bdd (diff) | |
| parent | 63f7d2343409be60aa8d3106d7626f19f637c27b (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I110c2737eab4b310ebcc6c245808fc032db61677
Diffstat (limited to 'LICENSE.GPL2')
0 files changed, 0 insertions, 0 deletions