Merge pull request #2470 from ilya-lavrenov:tapi_reduction

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

Thu, 13 Mar 2014 14:42:00 +0000 (18:42 +0400)

committer OpenCV Buildbot <buildbot@opencv.org>

Thu, 13 Mar 2014 14:42:01 +0000 (18:42 +0400)
author Andrey Pavlenko <andrey.pavlenko@itseez.com>
Thu, 13 Mar 2014 14:42:00 +0000 (18:42 +0400)
committer OpenCV Buildbot <buildbot@opencv.org>
Thu, 13 Mar 2014 14:42:01 +0000 (18:42 +0400)
diff --cc modules/core/perf/opencl/perf_arithm.cpp
Simple merge
diff --cc modules/core/src/stat.cpp
Simple merge
author	Andrey Pavlenko <andrey.pavlenko@itseez.com>
	Thu, 13 Mar 2014 14:42:00 +0000 (18:42 +0400)
committer	OpenCV Buildbot <buildbot@opencv.org>
	Thu, 13 Mar 2014 14:42:01 +0000 (18:42 +0400)
		1	2
modules/core/perf/opencl/perf_arithm.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
modules/core/src/stat.cpp	patch \|	diff1 \|	diff2 \|	blob \| history