diff options
author | Liang Qi <liang.qi@qt.io> | 2016-06-09 11:15:18 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-06-09 11:15:18 +0200 |
commit | f512a085d360bbeea16188fd3cae421a29cf9b71 (patch) | |
tree | de81fedf776552205149cbfb10e757c5916f9549 /src | |
parent | 827e255b6f380af2ec303f446c8cd8af33dfa8b0 (diff) | |
parent | 0e101773138968fcddac7ce4562ca31c27a2a79b (diff) |
Merge remote-tracking branch 'origin/5.6.1' into 5.6
Change-Id: I315e9fde41e59ec5ad8ec98ad979904af0cbda02
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions