projects / profile / ivi / opencv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c5e569d 3d3e9ab)
Merge pull request #1164 from bitwangyaoyao:master_fixHaar
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Tue, 30 Jul 2013 12:14:23 +0000 (16:14 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 30 Jul 2013 12:14:24 +0000 (16:14 +0400)
1  2 
modules/ocl/include/opencv2/ocl.hpp patch | diff1 | diff2 | blob | history
modules/ocl/test/test_objdetect.cpp patch | diff1 | diff2 | blob | history

diff --cc modules/ocl/include/opencv2/ocl.hpp
Simple merge
diff --cc modules/ocl/test/test_objdetect.cpp
Simple merge
Domain: Multimedia / Uncategorized;