[opencv] 90/98: Merge pull request #6421 from alalek:backport_6417

[Mattia Rizzolo]

This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to annotated tag 2.4.13
in repository opencv.

commit de164b0ccfc706b5878a227b61098a2dfb45e80f
Merge: 3bd6912 194f1be
Author: Alexander Alekhin <alexander.alekhin at itseez.com>
Date:   Mon Apr 18 15:12:16 2016 +0000

    Merge pull request #6421 from alalek:backport_6417

 modules/highgui/src/grfmt_jpeg2000.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git