Merge branch '2.4'
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Thu, 28 Feb 2013 07:10:40 +0000 (11:10 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Thu, 28 Feb 2013 07:17:06 +0000 (11:17 +0400)
commit891d7da6eef8d83724cfc19a87d7b2a3f94492f5
tree98df48f6ffc5d8cc27f04d35844e0c5e471e0db9
parentc5e979ceb7127cbf6f527dfa86eee627b53b250b
parent2be893a21ea264cde83bcd4aa3a50dc2943062e4
Merge branch '2.4'
21 files changed:
cmake/OpenCVDetectCUDA.cmake
doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst
modules/core/include/opencv2/core/core.hpp
modules/core/src/algorithm.cpp
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/features2d/src/features2d_init.cpp
modules/ocl/doc/introduction.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/fft.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/interpolate_frames.cpp
modules/ocl/src/kernels/moments.cl
modules/ocl/src/kernels/nonfree_surf.cl
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/mcwutil.cpp
modules/ocl/src/mcwutil.hpp
modules/ocl/src/moments.cpp
modules/ocl/src/precomp.hpp
modules/ocl/src/pyrlk.cpp
modules/ocl/src/surf.cpp
samples/ocl/performance.cpp