mirror of
https://github.com/opencv/opencv.git
synced 2025-06-10 11:03:03 +08:00
![]() 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 |
||
---|---|---|
.. | ||
android_lib | ||
android_test | ||
generator | ||
jar | ||
check-tests.py | ||
CMakeLists.txt |