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 |
||
|---|---|---|
| .. | ||
| 15-puzzle | ||
| color-blob-detection | ||
| face-detection | ||
| hello-android | ||
| image-manipulations | ||
| tutorial-0-androidcamera | ||
| tutorial-1-addopencv | ||
| tutorial-2-opencvcamera | ||
| tutorial-3-native | ||
| tutorial-4-mixed | ||
| .gitignore | ||
| CMakeLists.txt | ||