Andrey Pavlenko c8a52daafd Merge pull request #2054 from alalek:ocl_tapi_dev_selection		2013-12-26 17:27:06 +04:00
..
include/opencv2	Merge pull request #2054 from alalek:ocl_tapi_dev_selection	2013-12-26 17:27:06 +04:00
misc	Merge pull request #1837 from asmorkalov:android_opencl	2013-11-25 12:19:20 +04:00
src	Merge pull request #2054 from alalek:ocl_tapi_dev_selection	2013-12-26 17:27:06 +04:00
CMakeLists.txt	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-08-13 12:56:39 +04:00