Baichuan Su 99a00d3dd9 Fix merge conflicts		2013-11-07 09:56:59 -08:00
..
doc	Cleaned up adaptive bilateral filtering, added support for gaussian interpolation, updated sample and docs	2013-11-06 16:48:50 +04:00
include/opencv2/ocl	Cleaned up adaptive bilateral filtering, added support for gaussian interpolation, updated sample and docs	2013-11-06 16:48:50 +04:00
perf	Merge pull request #1739 from pengx17:2.4_ocl_overload_haar	2013-11-06 13:31:11 +04:00
src	A minor fix.	2013-11-07 08:52:40 -08:00
test	Fix merge conflicts	2013-11-07 09:56:59 -08:00
CMakeLists.txt	ocl: force to use Khronos OpenCL headers	2013-10-18 15:47:11 +04:00