Merge pull request #2065 from ilya-lavrenov:tapi_calcBackProject

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

Thu, 26 Dec 2013 16:37:33 +0000 (20:37 +0400)

committer OpenCV Buildbot <buildbot@opencv.org>

Thu, 26 Dec 2013 16:37:34 +0000 (20:37 +0400)
author Andrey Pavlenko <andrey.pavlenko@itseez.com>
Thu, 26 Dec 2013 16:37:33 +0000 (20:37 +0400)
committer OpenCV Buildbot <buildbot@opencv.org>
Thu, 26 Dec 2013 16:37:34 +0000 (20:37 +0400)
diff --cc modules/core/src/matrix.cpp
Simple merge
diff --cc modules/imgproc/src/histogram.cpp
Simple merge
author	Andrey Pavlenko <andrey.pavlenko@itseez.com>
	Thu, 26 Dec 2013 16:37:33 +0000 (20:37 +0400)
committer	OpenCV Buildbot <buildbot@opencv.org>
	Thu, 26 Dec 2013 16:37:34 +0000 (20:37 +0400)
		1	2
modules/core/src/matrix.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
modules/imgproc/src/histogram.cpp	patch \|	diff1 \|	diff2 \|	blob \| history