diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 19:05:04 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 19:05:04 +0100 |
| commit | 1246720283e41f20323d93cdcc96fdfa2fb5eacd (patch) | |
| tree | 87582b43e76e18afea512f37c90f6b2e9f7c77ee | |
| parent | 5928fda0dac032430f8de32885bfabd2792432d1 (diff) | |
| parent | 49488723aa37f6f208f62312efe9f66b249648f8 (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
src/3rdparty
Change-Id: I6897c50a0cd86dd0989663151d18bacfca91192b
0 files changed, 0 insertions, 0 deletions