Merge branch 'master' of git://github.com/Itseez/opencv into ocl_hough
authorSuenghoon Park <pclove1@gmail.com>
Wed, 26 Dec 2012 22:40:38 +0000 (17:40 -0500)
committerSuenghoon Park <pclove1@gmail.com>
Wed, 26 Dec 2012 22:40:38 +0000 (17:40 -0500)
commit2124de80a57844a7475165549c5375d340c193fe
treef71a555a7d90ed1b1c66cf68fdd95279bba2c44d
parent8a1d6a1bb28642fb804a10873984e61c7be3e2ab
parent132b5d64350e3e9ce728c41d1c1f5d6847b8dfc8
Merge branch 'master' of git://github.com/Itseez/opencv into ocl_hough