Andrey Kamaev 7f542e391a Merge branch 2.4 ... 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		2012-11-20 19:12:00 +04:00
..
Android.mk	Fix Andoid samples: black screen after resume problem	2012-08-24 16:55:12 +04:00
Application.mk	Improving compatibility with the latest Android SDK (r21) and NDK (r8c).	2012-11-20 18:40:22 +04:00
DetectionBasedTracker_jni.cpp	Face detection package name replaced on org.opencv.facedetect for consistency with Google Play package.	2012-11-09 09:40:19 +04:00
DetectionBasedTracker_jni.h	Face detection package name replaced on org.opencv.facedetect for consistency with Google Play package.	2012-11-09 09:40:19 +04:00