-
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 |
|---|---|---|
| 3rdparty | ||
| android | ||
| apps | ||
| cmake | ||
| data | ||
| doc | ||
| include | ||
| ios | ||
| modules | ||
| samples | ||
| .gitattributes | ||
| .gitignore | ||
| CMakeLists.txt | ||
| README | ||
| index.rst |