[opencv] 49/53: Merge pull request #9218 from alalek:backport_2.4

[Nobuhiro Iwamatsu]

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

iwamatsu pushed a commit to annotated tag 2.4.13.3
in repository opencv.

commit d19147bc785b7a2e667e600a3ad139b0a4564550
Merge: 8736ece fc2a71d
Author: Alexander Alekhin <alexander.a.alekhin at gmail.com>
Date:   Mon Jul 24 11:40:51 2017 +0000

    Merge pull request #9218 from alalek:backport_2.4
    
    (2.4) Backport changes from master

 CMakeLists.txt                  | 18 ++++++++----------
 cmake/OpenCVModule.cmake        |  2 +-
 cmake/OpenCVPCHSupport.cmake    |  6 ++++++
 modules/highgui/src/cap_v4l.cpp |  6 +++---
 4 files changed, 18 insertions(+), 14 deletions(-)

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