Andrey Kamaev 57d3152cd0 Merge branch '2.4'		2013-01-31 14:35:27 +04:00
..
doc	Merge pull request #267 from pclove1:ocl_hough	2013-01-19 12:02:14 +04:00
include/opencv2/ocl	Merge branch '2.4'	2013-01-31 14:35:27 +04:00
perf	Merge branch '2.4'	2013-01-25 16:30:36 +04:00
src	Merge branch '2.4'	2013-01-29 14:17:13 +04:00
test	Merge branch '2.4'	2013-01-25 16:30:36 +04:00
cl2cpp.cmake	Convert cl2cpp.py script to cmake	2012-10-22 17:19:55 +04:00
CMakeLists.txt	Fix OpenCL build warnings	2013-01-25 16:19:59 +04:00