7f542e391a
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 |
||
---|---|---|
.. | ||
libinfo | ||
package | ||
scripts | ||
service | ||
android.toolchain.cmake | ||
java.rst | ||
README.android | ||
refman.rst |
See http://opencv.org/android