Merge pull request #2586 from ilya-lavrenov:ipp_disable

author Andrey Pavlenko <andrey.pavlenko@itseez.com>

Wed, 9 Apr 2014 10:16:24 +0000 (14:16 +0400)

committer OpenCV Buildbot <buildbot@opencv.org>

Wed, 9 Apr 2014 10:16:25 +0000 (14:16 +0400)
author Andrey Pavlenko <andrey.pavlenko@itseez.com>
Wed, 9 Apr 2014 10:16:24 +0000 (14:16 +0400)
committer OpenCV Buildbot <buildbot@opencv.org>
Wed, 9 Apr 2014 10:16:25 +0000 (14:16 +0400)
diff --cc modules/core/src/stat.cpp
Simple merge
diff --cc modules/imgproc/src/color.cpp
Simple merge
diff --cc modules/imgproc/src/smooth.cpp
Simple merge
author	Andrey Pavlenko <andrey.pavlenko@itseez.com>
	Wed, 9 Apr 2014 10:16:24 +0000 (14:16 +0400)
committer	OpenCV Buildbot <buildbot@opencv.org>
	Wed, 9 Apr 2014 10:16:25 +0000 (14:16 +0400)
		1	2
modules/core/src/stat.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
modules/imgproc/src/color.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
modules/imgproc/src/smooth.cpp	patch \|	diff1 \|	diff2 \|	blob \| history