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_lib	Improving compatibility with the latest Android SDK (r21) and NDK (r8c).	2012-11-20 18:40:22 +04:00
android_test	Merge branch 2.4	2012-11-20 19:12:00 +04:00
generator	Merge release 2.4.3	2012-11-02 17:58:02 +04:00
jar	Add experimental support for desktop Java	2012-09-17 13:21:20 +04:00
check-tests.py	Normalize line endings and whitespace	2012-10-17 15:57:49 +04:00
CMakeLists.txt	New sample framework integrated to Java part of SDK;	2012-10-23 20:06:33 +04:00