Fixed incorrectly merged patch.
authorAndrey Kamaev <no@email>
Thu, 9 Feb 2012 20:22:36 +0000 (20:22 +0000)
committerAndrey Kamaev <no@email>
Thu, 9 Feb 2012 20:22:36 +0000 (20:22 +0000)
commit68a54e7f3c1bcede53dddfa9ef0fb167cd5a771c
tree77700d27c4d4d3474df42f751ba12c5d67d9ed34
parent3ef5bfa1851d1895a7dd4e7690819d475357ec63
Fixed incorrectly merged patch.
cmake/OpenCVGenConfig.cmake
cmake/templates/OpenCVConfig.cmake.in
modules/androidcamera/CMakeLists.txt
modules/highgui/CMakeLists.txt