Merge remote-tracking branch 'original/master' into constrained-hough-lines
authorScott Breyfogle <swb02009@mymail.pomona.edu>
Fri, 31 Jan 2014 22:27:51 +0000 (14:27 -0800)
committerScott Breyfogle <swb02009@mymail.pomona.edu>
Fri, 31 Jan 2014 22:27:51 +0000 (14:27 -0800)
commitaaa9be7c65a0e2bc24526046c8de6e67a742b1e8
treeb90a0b8498e7db65eeb1585976fdbe6970814f62
parentb074c67a56b874c7d6270eaf8a6c2f1ec239c669
parent983799d3983ad10543711dd79b4d8d50372273ae
Merge remote-tracking branch 'original/master' into constrained-hough-lines
modules/imgproc/include/opencv2/imgproc.hpp