Roman Donchenko cd576c7364 Merge pull request #2096 from kamjagin:master		2013-12-31 11:53:25 +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 #2096 from kamjagin:master	2013-12-31 11:53:25 +04:00
perf	disabled cv::split perf test	2013-12-27 21:57:20 +04:00
src	Merge pull request #2095 from ilya-lavrenov:tapi_mixchannels_fix	2013-12-31 00:35:39 +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