Vadim Pisarevsky 7d9041460a Merge pull request #885 from pengx17:2.4_bfmatcher_ocl		2013-05-15 14:21:50 +04:00
..
doc	Fix build errors	2013-03-21 18:37:34 +04:00
include/opencv2/ocl	Merge pull request #885 from pengx17:2.4_bfmatcher_ocl	2013-05-15 14:21:50 +04:00
perf	use clflush replaces clfinish	2013-04-02 14:41:02 +08:00
src	Merge branch '2.4' of https://github.com/Itseez/opencv into 2.4_pyrup_fix	2013-05-15 08:55:43 +08:00
test	Merge pull request #839 from pengx17:2.4_ocl_csbp	2013-05-14 15:56:07 +04:00
CMakeLists.txt	Move OpenCL SURF to nonfree module	2013-03-21 17:59:35 +04:00