Roman Donchenko 09e154d214 Merge commit '60906d917' into merge-2.4 ... Conflicts: modules/ts/src/cuda_perf.cpp		2013-12-30 16:47:05 +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 commit '60906d917' into merge-2.4	2013-12-30 16:47:05 +04:00
CMakeLists.txt	Merge commit '60906d917' into merge-2.4	2013-12-30 16:47:05 +04:00