Merge Upstream version 1.4.2 from branch 'upstream' into tizen 64/59264/1
authorVineeth TM <vineeth.tm@samsung.com>
Fri, 12 Feb 2016 02:51:54 +0000 (11:51 +0900)
committerVineeth TM <vineeth.tm@samsung.com>
Fri, 12 Feb 2016 02:55:34 +0000 (11:55 +0900)
commitfb96b89aff42ae869e7be0665e09b5423cea9726
tree2392adb8e7aafcf764bfa9ad004fd06bdb145da5
parent6180530b9739ded15d55933da81df3d51cf28dce
parent53058177d4d3a1ea609fe603f59b16281d2c8c3d
Merge Upstream version 1.4.2 from branch 'upstream' into tizen

Signed-off-by: Vineeth TM <vineeth.tm@samsung.com>
Conflicts:
cdjpeg.h
jmorecfg.h
wrjpgcom.c

Change-Id: I5e6eb84dfad65eba7d7af43887b45e377e0bb457
bmp.c
cdjpeg.h
jdhuff.c
jmorecfg.h
rdswitch.c
wrjpgcom.c