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