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
..
doc	Merge release 2.4.3	2012-11-02 17:58:02 +04:00
include/opencv2/contrib	Merge branch 2.4	2012-11-20 19:12:00 +04:00
src	Merge branch 2.4	2012-11-20 19:12:00 +04:00
test	Fix OS X build warnings	2012-11-09 11:29:52 +04:00
CMakeLists.txt	Making all dependencies from highgui module optional	2012-06-26 07:29:36 +00:00