[opencv] 45/98: Merge pull request #6228 from wangguoqin1001: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 7e44faf6353a40d6201aad5f38d6a37a2bea43a8
Merge: ea049e1 8cfc87c
Author: Maksim Shabunin <maksim.shabunin at itseez.com>
Date:   Thu Mar 10 08:10:19 2016 +0000

    Merge pull request #6228 from wangguoqin1001:2.4

 modules/highgui/src/cap_qtkit.mm | 7 +++++++
 1 file changed, 7 insertions(+)

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