opencv/modules/ocl
Roman Donchenko feaa12a274 Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	modules/core/include/opencv2/core/version.hpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/initialization.cpp
	modules/ocl/test/main.cpp
	modules/superres/CMakeLists.txt
	modules/superres/src/input_array_utility.cpp
	modules/superres/src/input_array_utility.hpp
	modules/superres/src/optical_flow.cpp
2013-07-16 11:52:41 +04:00
..
doc Add some documentation on ocl::convolve 2013-04-08 17:15:52 +08:00
include/opencv2 Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-07-16 11:52:41 +04:00
perf Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-07-03 19:53:21 +04:00
src Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-07-16 11:52:41 +04:00
test Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-07-16 11:52:41 +04:00
CMakeLists.txt add accuracy tests while running perf 2013-05-17 13:18:46 +08:00