diff options
author | Liang Qi <liang.qi@qt.io> | 2016-10-01 21:58:04 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-10-01 21:58:04 +0200 |
commit | f0482d704e3834f2199889f997b421c0171bd94f (patch) | |
tree | e18c050e92771e32e4ea259ad7ba170683403f7e /dist | |
parent | b3d27c681ac216f82ea8b2de1e21858a6c2b7af0 (diff) | |
parent | 0d31e8cd10d09fd2b28052c89a4f96c32c104848 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Iba3271a050240b60f21e1696af320fdf82a7dd34
Diffstat (limited to 'dist')
0 files changed, 0 insertions, 0 deletions