-
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 |
|---|---|---|
| .. | ||
| MacOSX/FaceTracker | ||
| android | ||
| c | ||
| cpp | ||
| gpu | ||
| ocl | ||
| python | ||
| python2 | ||
| CMakeLists.txt |