Roman Donchenko 9dc93ce328 Merge pull request #2176 from SpecLad:merge-2.4		2014-01-20 18:04:56 +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 remote-tracking branch 'origin/2.4' into merge-2.4	2014-01-20 15:10:19 +04:00
src	Fix the following error for ocl::getOpenCLPlatforms() on Ubuntu 12.04 with gcc 4.8	2014-01-13 16:09:42 +01: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