Merge pull request #1222 from philippefoubert:branch_2.4_pvapi
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Mon, 5 Aug 2013 06:20:24 +0000 (10:20 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 5 Aug 2013 06:20:25 +0000 (10:20 +0400)
commitaf8a03e17ff2c206cd473b344dd9a45732a49177
treebec3d286208c760c8e5cd9a83f97d4940c5f16fb
parenta2ff1b07b3730874c0ad7ac4661184ecff9141e2
parent9c04db554f753b7648f0a2a8e19eb9e93e085c0c
Merge pull request #1222 from philippefoubert:branch_2.4_pvapi
cmake/OpenCVFindLibsVideo.cmake
modules/highgui/CMakeLists.txt