Merge branch 'master' of git://github.com/Itseez/opencv into ocl_hough
authorSuenghoon Park <pclove1@gmail.com>
Wed, 2 Jan 2013 19:59:59 +0000 (14:59 -0500)
committerSuenghoon Park <pclove1@gmail.com>
Wed, 2 Jan 2013 19:59:59 +0000 (14:59 -0500)
commit269ccaa4311d6736a1c3fb72949c754595df67ff
tree12f08698f33f11a18ffeb55bbfde9a7a6a775939
parent4f965296fc0441b937c0555299d456ad7ffc8a20
parent47963f008344fdf0ef355e4ad17310bd6fabe76b
Merge branch 'master' of git://github.com/Itseez/opencv into ocl_hough