Merge release 2.4.4
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 4 Mar 2013 15:29:40 +0000 (19:29 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 4 Mar 2013 15:43:49 +0000 (19:43 +0400)
commit9e12b7c3c26ed1b8db7c016cfa46eec2ed78266e
tree71a5177afe662f3e545776d4552bef519d073a3b
parent52a45ed191c02d79b01af1e453f4931d579b8c35
parentfacab40745af0abfd7e7f9ee08f2ab0ab9c7c741
Merge release 2.4.4
18 files changed:
CMakeLists.txt
cmake/OpenCVCompilerOptions.cmake
cmake/templates/OpenCVConfig.cmake.in
data/haarcascades/haarcascade_smile.xml
modules/gpu/src/imgproc.cpp
modules/gpu/src/mssegmentation.cpp
modules/gpu/src/pyrlk.cpp
modules/gpu/test/test_core.cpp
modules/highgui/CMakeLists.txt
modules/java/generator/gen_java.py
modules/ocl/src/arithm.cpp
modules/ocl/src/blend.cpp
modules/ocl/src/brute_force_matcher.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/kernels/brute_force_match.cl
modules/ocl/src/kernels/nonfree_surf.cl
modules/ocl/src/surf.cpp
samples/ocl/performance.cpp