Merge https://github.com/Itseez/opencv
authorNghia Ho <nghiaho12@yahoo.com>
Wed, 14 Aug 2013 12:38:39 +0000 (22:38 +1000)
committerNghia Ho <nghiaho12@yahoo.com>
Wed, 14 Aug 2013 12:38:39 +0000 (22:38 +1000)
commit2c9c4188ae8f08cc1a47e6025659c357bed3c963
treecdefd994f7a62878a706119a57bf668634887911
parent79965c9ee9eade95623a028820c7c1a899919ba2
parent7992402ecf450c0f07c12275b4597298156aaacb
Merge https://github.com/Itseez/opencv
modules/imgproc/include/opencv2/imgproc.hpp