Vladislav Vinogradov 54e7c76d99 fixed compilation errors		2013-04-17 15:24:53 +04:00
..
doc	Add some documentation on ocl::convolve	2013-04-08 17:15:52 +08:00
include/opencv2	Merge branch '2.4'	2013-04-17 12:07:17 +04:00
perf	Remove C API from OpenCL module	2013-04-12 14:37:02 +04:00
src	fixed compilation errors	2013-04-17 15:24:53 +04:00
test	Merge branch '2.4'	2013-04-17 12:07:17 +04:00
CMakeLists.txt	Merge branch '2.4'	2013-04-05 21:11:59 +04:00