summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-09-30 14:36:23 +0200
committerLiang Qi <liang.qi@qt.io>2016-09-30 14:36:23 +0200
commit792f91dc8754ea906eea1268f55e66256c2c97a9 (patch)
treebe5e7325978d60c3b496fb7ec83ca1caa2e05677
parentc9d71e9eeb925ee4236acefeb88b14d80d04ba5e (diff)
parentc5557d43eea3c65591e37e3c79b6fa0f590c915b (diff)
Merge remote-tracking branch 'origin/5.6.2' into 5.6
Conflicts: .gitmodules Change-Id: Ifffec3df90687a6ad84547bb0f603b0446bf0e9d
0 files changed, 0 insertions, 0 deletions