Roman Donchenko 6d84671e8b Merge pull request #2116 from ilya-lavrenov:tapi_mixchannels_fix		2014-01-09 12:41:57 +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 #2102 from Nerei:compilatin_for_windows	2014-01-09 12:35:30 +04:00
perf	disabled cv::split perf test	2013-12-27 21:57:20 +04:00
src	fixed cv::mixChannels OpenCL version	2014-01-06 14:41:57 +04:00
test	added OpenCL version of cv::patchNaNs	2013-12-30 19:53:03 +04:00
CMakeLists.txt	Merge commit 'ee36717d' into merge-2.4	2013-12-30 16:49:39 +04:00