diff options
author | Liang Qi <liang.qi@qt.io> | 2016-06-24 07:07:24 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-06-24 07:10:02 +0200 |
commit | 39a03d3d6a55cc676871caad674514afa274090d (patch) | |
tree | c35832f037e198d752782861580269f6d8ede39c /qtbase | |
parent | 7a8c8742316260fbb8304c4fde247ed05ae0b83d (diff) | |
parent | 3727ce11ac47a515d0d996220ca4de9adf67b26d (diff) |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I5ed83c8f42be099c545dfdcc96a34f7d33cfcda7
Diffstat (limited to 'qtbase')
0 files changed, 0 insertions, 0 deletions