Ilya Lavrenov 37789f015a deleted excess semicolons, commas		2014-01-18 01:31:33 +04:00
..
doc	Merge pull request #2034 from pentschev:ocl_features2d_orb_master	2013-12-27 15:49:28 +04:00
include/opencv2	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-01-14 11:53:59 +04:00
perf	Merge pull request #2034 from pentschev:ocl_features2d_orb_master	2013-12-27 15:49:28 +04:00
src	Merge commit '0566ab4d3d' into merge-2.4	2013-12-30 16:51:46 +04:00
test	deleted excess semicolons, commas	2014-01-18 01:31:33 +04:00
CMakeLists.txt	ocl: add support for initialization from user-provided OpenCL handles	2013-12-12 19:59:22 +04:00