diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-09-10 14:24:15 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-09-10 14:24:15 +0200 |
commit | 9bde4402256bc14fd5d95b9027bdd2e151aa8870 (patch) | |
tree | d88180dedd312111080a1c7c45f4705dde0b9bbc /qtimageformats | |
parent | e734941df8b37795eca7ad00044ed0c7d43eefe4 (diff) | |
parent | dd1aeea722ee72249c7e1c5a85c0932b61300b7b (diff) |
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: I7a28bcaeb5538763274fdef20f8c8ca81b9b21ad
Diffstat (limited to 'qtimageformats')
0 files changed, 0 insertions, 0 deletions