Fix the problem of haar caused by merge
authoryao <bitwangyaoyao@gmail.com>
Mon, 22 Jul 2013 09:53:56 +0000 (17:53 +0800)
committeryao <bitwangyaoyao@gmail.com>
Mon, 22 Jul 2013 09:53:56 +0000 (17:53 +0800)
commit3d3e9ab6357de2293c064aaa95b9b39785719086
treea5ed27315d1e9215b23889269cf68a21c6f04aca
parent616dbd53f02069834d224a518459ebb5efb1425c
Fix the problem of haar caused by merge
modules/ocl/doc/object_detection.rst
modules/ocl/include/opencv2/ocl.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/precomp.hpp
modules/ocl/test/test_objdetect.cpp
samples/ocl/facedetect.cpp