Merge pull request #1486 from nzjrs:cv2-logpolar

author Roman Donchenko <roman.donchenko@itseez.com>

Tue, 29 Oct 2013 12:15:56 +0000 (16:15 +0400)

committer OpenCV Buildbot <buildbot@opencv.org>

Tue, 29 Oct 2013 12:15:57 +0000 (16:15 +0400)
author Roman Donchenko <roman.donchenko@itseez.com>
Tue, 29 Oct 2013 12:15:56 +0000 (16:15 +0400)
committer OpenCV Buildbot <buildbot@opencv.org>
Tue, 29 Oct 2013 12:15:57 +0000 (16:15 +0400)
diff --cc modules/imgproc/include/opencv2/imgproc.hpp
Simple merge
diff --cc modules/imgproc/src/imgwarp.cpp
Simple merge
author	Roman Donchenko <roman.donchenko@itseez.com>
	Tue, 29 Oct 2013 12:15:56 +0000 (16:15 +0400)
committer	OpenCV Buildbot <buildbot@opencv.org>
	Tue, 29 Oct 2013 12:15:57 +0000 (16:15 +0400)
		1	2
modules/imgproc/include/opencv2/imgproc.hpp	patch \|	diff1 \|	diff2 \|	blob \| history
modules/imgproc/src/imgwarp.cpp	patch \|	diff1 \|	diff2 \|	blob \| history