diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-12-01 22:52:38 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-12-01 22:52:38 +0100 |
| commit | 14a2de2e7f87bee3d854e17d798380232ddd913b (patch) | |
| tree | 53b6e8641ff7bc8e418ad7be5ea1b280a12173f7 /LICENSE.GPL2 | |
| parent | 3b28b32df28123aee8fff1e353c9c49b5644220f (diff) | |
| parent | c49209f274ca5b487eb4f94400cec5d5567dec60 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: I669796853f67166a688c885e0db415a534d1bbb4
Diffstat (limited to 'LICENSE.GPL2')
0 files changed, 0 insertions, 0 deletions