Roman Donchenko 84c29745f2 Merge pull request #2211 from SpecLad:merge-2.4		2014-01-28 12:44:29 +04:00
..
doc	merge with upstream	2014-01-05 19:00:25 +01:00
include/opencv2	Merge branch 'master' of https://github.com/Itseez/opencv into brief_cl	2014-01-18 10:38:07 +01:00
perf	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-01-27 15:28:14 +04:00
src	Merge pull request #2027 from AD-530:brief_cl	2014-01-27 09:49:46 +04:00
test	warn fix	2014-01-27 12:34:30 +04:00
CMakeLists.txt	ocl: add support for initialization from user-provided OpenCL handles	2013-12-12 19:59:22 +04:00