opencv/modules/ocl
Roman Donchenko 2c4bbb313c Merge commit '43aec5ad' into merge-2.4
Conflicts:
	cmake/OpenCVConfig.cmake
	cmake/OpenCVLegacyOptions.cmake
	modules/contrib/src/retina.cpp
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/video.rst
	modules/gpu/src/speckle_filtering.cpp
	modules/python/src2/cv2.cv.hpp
	modules/python/test/test2.py
	samples/python/watershed.py
2013-08-27 13:26:44 +04:00
..
doc Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
include/opencv2 Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
perf Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
src Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
test Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
CMakeLists.txt add accuracy tests while running perf 2013-05-17 13:18:46 +08:00