← Back to branch summary

~neon/qt/qtimageformats

~neon/qt/qtimageformats

Viewing all changes in revision 92.

Committer: Frederik Gladhorn
Date: 2014-11-27 17:28:46 UTC
mfrom: (86.1.9)
Revision ID: git-v1:59354c50b52131987d5716f3254ddd2b5b2b4865

Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: I8b76d2098cc2d8bca5a63798d53182144d6a4442

files modified:
config.tests/libwebp/libwebp.cpp

src/3rdparty/jasper/src/libjasper/base/jas_getopt.c

src/3rdparty/jasper/src/libjasper/bmp/bmp_dec.c

src/3rdparty/jasper/src/libjasper/jpc/jpc_t1dec.c

src/3rdparty/jasper/src/libjasper/jpc/jpc_tsfb.c

src/3rdparty/jasper/src/libjasper/mif/mif_cod.c

src/3rdparty/jasper/src/libjasper/pnm/pnm_dec.c

src/plugins/imageformats/imageformats.pro

Show diffs side-by-side

added added

removed removed

config.tests/libwebp/libwebp.cpp

src/3rdparty/jasper/src/libjasper/base/jas_getopt.c

src/3rdparty/jasper/src/libjasper/bmp/bmp_dec.c

src/3rdparty/jasper/src/libjasper/jpc/jpc_t1dec.c

src/3rdparty/jasper/src/libjasper/jpc/jpc_tsfb.c

src/3rdparty/jasper/src/libjasper/mif/mif_cod.c

src/3rdparty/jasper/src/libjasper/pnm/pnm_dec.c

src/plugins/imageformats/imageformats.pro

Older »