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

res

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

src/org/opencv/test

Merge branch 2.4

2012-11-20 19:12:00 +04:00

.classpath

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

.gitignore

Add gitignore for Android tests and samples

2012-09-10 15:48:57 +04:00

.project

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

AndroidManifest.xml

merged all the latest changes from 2.4 to trunk

2012-04-13 21:50:59 +00:00

CMakeLists.txt

Fix Android build with CMake 2.6.3-2.8.3

2012-09-04 16:21:44 +04:00