• 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
..
doc Loading commit data...
engine Loading commit data...
engine_test Loading commit data...
CMakeLists.txt Loading commit data...
ReadMe.txt Loading commit data...
all.py Loading commit data...
device.conf Loading commit data...
push_native.py Loading commit data...
test_native.py Loading commit data...