diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-24 19:35:51 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-28 11:46:59 +0100 |
| commit | 73dc5f8de51ad1fcaff8e30188de23a4d6ff39b4 (patch) | |
| tree | b15b727006c2211e2d93cb66ad668b4815208e7c /README | |
| parent | becd0cfc4bcbaa5fe0eca0cca6e97961bc5ad911 (diff) | |
| parent | 120479a3275b4c7844613777525bd3b1b48eefed (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.75.7
Conflicts:
doc/src/legal/licenses.qdoc
Change-Id: Id0fb35581b32d98cc9172a7eea6f6e2375cee1f0
Diffstat (limited to 'README')
0 files changed, 0 insertions, 0 deletions