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	Code review coments fixed. Lint wornings fixed.	2012-10-23 20:06:58 +04:00
src/org/opencv/samples/colorblobdetect	Merge release 2.4.3	2012-11-02 17:58:02 +04:00
.classpath	Code review coments fixed. Lint wornings fixed.	2012-10-23 20:06:58 +04:00
.project	Android samples renaming was done. Icon updated.	2012-07-02 10:06:08 +00:00
AndroidManifest.xml	Fix package name of Android color blob detection sample	2012-08-31 17:47:12 +04:00
CMakeLists.txt	merged 2.4 into trunk	2012-04-30 14:33:52 +00:00