Andrey Pavlenko 8176e893c0 Merge pull request #2609 from alalek:tests_fixes		2014-04-14 18:54:01 +04:00
..
doc	Change Canny input image description, we can use multichannel image now	2014-04-07 14:26:48 +04:00
include/opencv2	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-03-11 17:20:01 +04:00
perf	fixed warning	2014-04-14 14:40:40 +04:00
src	Merge pull request #2610 from ilya-lavrenov:ipp_cvtcolor	2014-04-14 18:52:07 +04:00
test	Merge pull request #2609 from alalek:tests_fixes	2014-04-14 18:54:01 +04:00
CMakeLists.txt	Global CMake reorganization:	2012-02-03 11:26:49 +00:00