diff options
author | Liang Qi <liang.qi@qt.io> | 2016-08-01 11:14:10 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-08-01 11:14:14 +0200 |
commit | 08cb6659a4bfd441760c26ab7f405c439c7d6ca3 (patch) | |
tree | d65e9c2f2fe8294fcb9483cfd96a4af8f3a83767 /dist | |
parent | c4e5ec187ce4f29a04e1e5d7b56e0e809707fb6d (diff) | |
parent | 20c00be872220f547211b87a2d3d34e12bd0f3d8 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: If96cff3a0eaf2e50afc873eda37772c58c9824eb
Diffstat (limited to 'dist')
0 files changed, 0 insertions, 0 deletions