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
..
.settings	Improving compatibility with the latest Android SDK (r21) and NDK (r8c).	2012-11-20 18:40:22 +04:00
jni	Merge branch 2.4	2012-11-20 19:12:00 +04:00
res	Code review coments fixed. Lint wornings fixed.	2012-10-23 20:06:58 +04:00
src/org/opencv/samples/facedetect	Face detection package name replaced on org.opencv.facedetect for consistency with Google Play package.	2012-11-09 09:40:19 +04:00
.classpath	Code review coments fixed. Lint wornings fixed.	2012-10-23 20:06:58 +04:00
.cproject	Improving compatibility with the latest Android SDK (r21) and NDK (r8c).	2012-11-20 18:40:22 +04:00
.project	Normalize line endings and whitespace	2012-10-17 15:57:49 +04:00
AndroidManifest.xml	Face detection package name replaced on org.opencv.facedetect for consistency with Google Play package.	2012-11-09 09:40:19 +04:00
CMakeLists.txt	Contrib module is added to java wrappers; fixed algorithm initialisation for python bindings	2012-07-05 07:58:40 +00:00