Skip to content

O
opencv
Switch branch/tag
History Find file
  • 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
..
_static Normalized file endings.
_themes/blue Merge commit '43aec5ad' into merge-2.4
pattern_tools Normalized file endings.
tutorials Merge remote-tracking branch 'origin/2.4' into merge-2.4
user_guide Merge branch '2.4'
vidsurv "atomic bomb" commit. Reorganized OpenCV directory structure
CMakeLists.txt Merge remote-tracking branch 'origin/2.4' into merge-2.4
Doxyfile.in Normalize line endings and whitespace
acircles_pattern.png propagated some more changes from 2.3 to trunk
check_docs.py Merge commit '43aec5ad' into merge-2.4
check_docs2.py fixed documentation build
check_docs_whitelist.txt updated whitelist
conf.py Removed references to opencv.itseez.com
haartraining.htm "atomic bomb" commit. Reorganized OpenCV directory structure
license.txt minor in license file
mymath.sty Normalized file endings.
ocv.py Remove documentation for old python wrapper
opencv-logo-white.png merged revisions r7802,r7804,r7805 from 2.4 branch
opencv-logo.png "atomic bomb" commit. Reorganized OpenCV directory structure
opencv-logo2.png Removed incorrect iCCP chunks from GUI resources.
opencv.bib added documentation on LatentSVM algorithm
opencv.ico remove interfaces from installation; remove opencv/utils dir completely
opencv.jpg "atomic bomb" commit. Reorganized OpenCV directory structure
opencv_cheatsheet.tex Converted tabs to spaces.
packaging.txt Normalize whitespace in documentation and text files
patch_refman_latex.py Loading commit data...
pattern.png Loading commit data...
reformat.py Loading commit data...