Alexander Alekhin 1ff9a8ef52 core/ocl: added warning about incompatible configuration		2014-01-27 13:52:52 +04:00
..
doc	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-12-23 18:50:17 +04:00
include/opencv2	Merge pull request #2155 from vbystricky:ocl_calcOpticalFlowPyrLK	2014-01-25 17:08:07 +04:00
perf	Merge pull request #2110 from hmax:master	2014-01-23 14:37:34 +04:00
src	core/ocl: added warning about incompatible configuration	2014-01-27 13:52:52 +04:00
test	Merge pull request #2156 from ilya-lavrenov:tapi_reduce	2014-01-22 10:12:08 +04:00
CMakeLists.txt	Merge commit 'ee36717d' into merge-2.4	2013-12-30 16:49:39 +04:00