diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-27 17:38:42 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-11-27 19:24:34 +0000 |
commit | 37a55e8840e53c78f855f17f2b5f453ed2058099 (patch) | |
tree | 9d5dcbe6f8b5078fe6a165e3b35b76817374fbd5 /lib | |
parent | eddb938c39d03e163ef47c965ea07ab19250eeed (diff) | |
parent | 8c57e8c012d1045f2bdb30d376625a32c33fdfc4 (diff) |
Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions