Merge pull request #1149 from jet47:generalized-hough-refactoring
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 14 Aug 2013 09:26:23 +0000 (13:26 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 14 Aug 2013 09:26:24 +0000 (13:26 +0400)
1  2 
modules/gpuimgproc/doc/hough.rst
modules/imgproc/include/opencv2/imgproc.hpp

Simple merge