Merge branch 'master' of git://github.com/Itseez/opencv into ocl_hough
authorSuenghoon Park <pclove1@gmail.com>
Mon, 24 Dec 2012 23:42:22 +0000 (18:42 -0500)
committerSuenghoon Park <pclove1@gmail.com>
Mon, 24 Dec 2012 23:42:22 +0000 (18:42 -0500)
commitecb6c2091500104395f589f65cabbd671be06dc5
treec0c181c95c9ab5970b15e352915ec9950d6f40b3
parente1c6564d5ed10297796220eed86d2d1d9ce8a744
parent13b6a3a15ed15a5bf679cf1c9502786656166c1a
Merge branch 'master' of git://github.com/Itseez/opencv into ocl_hough