diff options
author | Liang Qi <liang.qi@qt.io> | 2016-05-19 13:26:24 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 13:26:32 +0200 |
commit | 09169bf5114f133e6974b08437c11b9fc5710f1c (patch) | |
tree | 57ce6396b7ffa66bb1236c5deb71e0c3b0024e51 /dist | |
parent | 368b0bbf2b2854547cfafa7092361f09dd157fb1 (diff) | |
parent | b0e7ac4227c04b3d9a3f90bb6203d3845d13e131 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I324ee61f7627de76bcc3765fe18fa009166fe5b5
Diffstat (limited to 'dist')
0 files changed, 0 insertions, 0 deletions