Skip to content

O
opencv
Switch branch/tag
History Find file
  • Andrey Kamaev's avatar
    Merge branch 2.4 · 7f542e39
    Andrey Kamaev authored 
    Conflicts:
	android/service/engine/AndroidManifest.xml - use file from 2.4
	modules/contrib/src/detection_based_tracker.cpp - move #include <pthread.h> as in 2.4
	modules/java/android_test/src/org/opencv/test/OpenCVTestRunner.java - use file from 2.4
    7f542e39
Name
Last commit
 Last update
..
adaptiveskindetector.cpp Loading commit data...
ba.cpp Loading commit data...
basicretinafilter.cpp Loading commit data...
basicretinafilter.hpp Loading commit data...
bowmsctrainer.cpp Loading commit data...
chamfermatching.cpp Loading commit data...
chowliutree.cpp Loading commit data...
colormap.cpp Loading commit data...
colortracker.cpp Loading commit data...
contrib_init.cpp Loading commit data...
detection_based_tracker.cpp Loading commit data...
facerec.cpp Loading commit data...
featuretracker.cpp Loading commit data...
fuzzymeanshifttracker.cpp Loading commit data...
gencolors.cpp Loading commit data...
hybridtracker.cpp Loading commit data...
imagelogpolprojection.cpp Loading commit data...
imagelogpolprojection.hpp Loading commit data...
inputoutput.cpp Loading commit data...
lda.cpp Loading commit data...
logpolar_bsm.cpp Loading commit data...
magnoretinafilter.cpp Loading commit data...
magnoretinafilter.hpp Loading commit data...
octree.cpp Loading commit data...
openfabmap.cpp Loading commit data...
parvoretinafilter.cpp Loading commit data...
parvoretinafilter.hpp Loading commit data...
polyfit.cpp Loading commit data...
precomp.cpp Loading commit data...
precomp.hpp Loading commit data...
retina.cpp Loading commit data...
retinacolor.cpp Loading commit data...
retinacolor.hpp Loading commit data...
retinafilter.cpp Loading commit data...
retinafilter.hpp Loading commit data...
rgbdodometry.cpp Loading commit data...
selfsimilarity.cpp Loading commit data...
spinimages.cpp Loading commit data...
stereovar.cpp Loading commit data...
templatebuffer.hpp Loading commit data...