Merge branch '2.4'
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Fri, 12 Apr 2013 11:35:38 +0000 (15:35 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Fri, 12 Apr 2013 11:35:38 +0000 (15:35 +0400)
commit3b364330ad4603b452b69160fe3793c20fd13b71
treedf6e6a9525b4e600ff6a8722517a97864e9e9a41
parentb0933dd47381ca46612da42b66e337f7935c2c38
parentabe2ea59edbb7671bbf014d308e888db2a9bfab6
Merge branch '2.4'
30 files changed:
cmake/OpenCVDetectOpenCL.cmake
doc/check_docs.py
doc/check_docs2.py
modules/core/test/test_io.cpp
modules/highgui/src/cap_v4l.cpp
modules/java/generator/gen_java.py
modules/java/generator/rst_parser.py
modules/nonfree/src/surf.ocl.cpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/opencl/arithm_flip.cl
modules/ocl/src/opencl/brute_force_match.cl
modules/ocl/src/opencl/filter_sep_row.cl
modules/ocl/src/opencl/imgproc_warpAffine.cl
modules/ocl/src/opencl/imgproc_warpPerspective.cl
modules/ocl/src/opencl/objdetect_hog.cl
modules/ocl/test/main.cpp
modules/ocl/test/test_brute_force_matcher.cpp
modules/python/src2/cv2.cpp
modules/python/src2/gen2.py
modules/python/src2/hdr_parser.py
modules/python/test/test.py
modules/python/test/test2.py
samples/cpp/freak_demo.cpp
samples/cpp/lkdemo.cpp
samples/python2/common.py
samples/python2/dft.py
samples/python2/watershed.py