diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-05-13 13:22:16 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-05-13 13:22:16 +0200 |
commit | 777967f97b8cd615807868d90e4f61a1c4faf024 (patch) | |
tree | 4f3c6a1101b6f5140fdf104f3bf36648ee6452f0 /.gitmodules | |
parent | 868e545eb2402063b562383f944fb5b865022de2 (diff) | |
parent | 9812986913250f1f61d90f1e75a3192b11533829 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
skipped all sha1 updates.
Change-Id: I1f741cf7bea806ab238b4f1b5585bb440dafd4f7
Diffstat (limited to '.gitmodules')
0 files changed, 0 insertions, 0 deletions