[opencv] 18/98: Merge pull request #5984 from terfendail:2.4

[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 be565c2235620ea1068782112c2b7c55dfd566aa
Merge: 5c21ca2 389f176
Author: Vadim Pisarevsky <vadim.pisarevsky at gmail.com>
Date:   Tue Jan 19 10:49:56 2016 +0000

    Merge pull request #5984 from terfendail:2.4

 modules/highgui/src/cap_v4l.cpp | 47 +++--------------------------------------
 1 file changed, 3 insertions(+), 44 deletions(-)

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