Ilya Lavrenov aa5326c231 cv::norm -> cvtest::norm in tests ...

Conflicts:

	modules/core/src/stat.cpp

2014-04-08 14:49:20 +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

Change sanity check for perfomance test of bilateral filter

2014-04-07 14:26:47 +04:00

src

Remove defined(HAVE_IPP)

2014-04-08 13:05:23 +04:00

test

cv::norm -> cvtest::norm in tests

2014-04-08 14:49:20 +04:00

CMakeLists.txt

Global CMake reorganization:

2012-02-03 11:26:49 +00:00