Ilya Lavrenov b73490f86c eliminated restriction src[i].channels() == 1 in cv::merge		2014-03-19 13:56:31 +04:00
..
doc	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-03-11 17:20:01 +04:00
include/opencv2	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-03-11 17:20:01 +04:00
perf	Merge pull request #2428 from alalek:ocl_copyMakeBorder_3channels	2014-03-17 13:10:34 +04:00
src	Merge pull request #2469 from alalek:ocl_pyrUp_pyrDown_3channels	2014-03-13 18:37:05 +04:00
test	eliminated restriction src[i].channels() == 1 in cv::merge	2014-03-19 13:56:31 +04:00
CMakeLists.txt	Global CMake reorganization:	2012-02-03 11:26:49 +00:00