yao 2f781a53a9 Fix arithm's substract mismatch caused by incomplete merge		2013-04-13 15:57:12 +08:00
..
doc	Add some documentation on ocl::convolve	2013-04-08 17:15:52 +08:00
include/opencv2	Merge branch '2.4'	2013-04-12 15:35:38 +04:00
perf	Remove C API from OpenCL module	2013-04-12 14:37:02 +04:00
src	Fix arithm's substract mismatch caused by incomplete merge	2013-04-13 15:57:12 +08:00
test	Merge branch '2.4'	2013-04-12 15:35:38 +04:00
CMakeLists.txt	Merge branch '2.4'	2013-04-05 21:11:59 +04:00