Merge branch 'master' of git://github.com/Itseez/opencv into ocl_hough
authorSuenghoon Park <pclove1@gmail.com>
Tue, 15 Jan 2013 17:21:25 +0000 (12:21 -0500)
committerSuenghoon Park <pclove1@gmail.com>
Tue, 15 Jan 2013 17:21:25 +0000 (12:21 -0500)
commit06da75ffe0cea7f2c5b6ca37f565d6c4e22211ea
treee01779614a3b72521903d8c77da2d1cafaac9f48
parent269ccaa4311d6736a1c3fb72949c754595df67ff
parent084b1c796900b0825fc4e0593ab3143da3f3a90e
Merge branch 'master' of git://github.com/Itseez/opencv into ocl_hough
modules/ocl/doc/image_processing.rst
modules/ocl/include/opencv2/ocl/ocl.hpp