Philippe FOUBERT ec6f2e1c4d Using cv::String instead of std::string.		2013-12-01 16:41:17 +01:00
..
doc	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-11-19 16:21:09 +04:00
include/opencv2	Merge pull request #1824 from vpisarev:ocl_experiments5	2013-11-20 19:14:40 +04:00
perf	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-11-19 16:21:09 +04:00
src	Using cv::String instead of std::string.	2013-12-01 16:41:17 +01:00
test	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-11-19 16:21:09 +04:00
CMakeLists.txt	ocl: force to use Khronos OpenCL headers	2013-10-18 15:47:11 +04:00