diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-21 14:43:07 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-21 14:45:30 +0200 |
| commit | 2eb5decb8245a7e93c4901872d21306b34dc018d (patch) | |
| tree | beffc2ac7b52dcc9c1d2fc2e6678a536616f112d /LGPL_EXCEPTION.txt | |
| parent | 1fe941917a3c93d74e9058f8ca9ed2b6b8ac78a3 (diff) | |
| parent | 38b83c33f3955570627f0235fa920b2b54440bdc (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6v5.6.0-alpha1
Change-Id: I8ddff668f1bbdaa032b365dac93b116cc86a3707
Diffstat (limited to 'LGPL_EXCEPTION.txt')
0 files changed, 0 insertions, 0 deletions