Merge pull request #1381 from 23pointsNorth:master
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 9 Sep 2013 15:53:55 +0000 (19:53 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 9 Sep 2013 15:53:56 +0000 (19:53 +0400)
1  2 
modules/imgproc/include/opencv2/imgproc.hpp
modules/imgproc/src/lsd.cpp

Simple merge