projects / platform / upstream / qtimageformats.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 08f40bc 338d48c)
Merge remote-tracking branch 'origin/5.3' into 5.4
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Tue, 14 Oct 2014 12:04:59 +0000 (14:04 +0200)
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Tue, 14 Oct 2014 12:04:59 +0000 (14:04 +0200)
Change-Id: I96f7e13e5a6f65dae1a9f7717e30021f81cf1e81

1  2 
tests/auto/webp/tst_qwebp.cpp patch | diff1 | diff2 | blob | history

diff --cc tests/auto/webp/tst_qwebp.cpp
Simple merge
Domain: UI Framework / Qt;