Merge pull request #871 from bitwangyaoyao:2.4_acry
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 13 May 2013 19:04:11 +0000 (23:04 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 13 May 2013 19:04:11 +0000 (23:04 +0400)
commit6eb5a95a5957bb228ef8bf134167b2e459ad5e0a
tree1deb0c238575034cb52672f346ffea159bc6eb64
parentfd83f2f5ca1c70f48ce2f8d6c051d54637e28a7a
parente23884a238efae54505c918ec97978ef3e5daff8
Merge pull request #871 from bitwangyaoyao:2.4_acry
modules/ocl/test/test_brute_force_matcher.cpp
modules/ocl/test/test_calib3d.cpp
modules/ocl/test/test_haar.cpp
modules/ocl/test/utility.hpp