• Roman Donchenko's avatar
    Merge remote-tracking branch 'origin/2.4' into merge-2.4 · 95c2e8b5
    Roman Donchenko authored
    Conflicts:
    	.gitignore
    	doc/tutorials/objdetect/cascade_classifier/cascade_classifier.rst
    	modules/gpu/src/match_template.cpp
    	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
    	modules/ocl/include/opencv2/ocl/ocl.hpp
    	modules/ocl/perf/perf_precomp.hpp
    95c2e8b5
Name
Last commit
Last update
..
MacOSX/FaceTracker Loading commit data...
android Loading commit data...
c Loading commit data...
cpp Loading commit data...
gpu Loading commit data...
java Loading commit data...
ocl Loading commit data...
python2 Loading commit data...
winrt/ImageManipulations Loading commit data...
CMakeLists.txt Loading commit data...