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	Merge branch 2.4	2012-11-20 19:12:00 +04:00
c	Merge branch 2.4	2012-11-13 19:54:48 +04:00
cpp	Merge branch 2.4	2012-11-13 19:54:48 +04:00
gpu	Merge branch 2.4	2012-11-13 19:54:48 +04:00
MacOSX/FaceTracker	Normalize whitespace in documentation and text files	2012-10-17 21:42:09 +04:00
ocl	Normalize line endings and whitespace	2012-10-17 15:57:49 +04:00
python	Normalize line endings and whitespace	2012-10-17 15:57:49 +04:00
python2	Normalize line endings and whitespace	2012-10-17 15:57:49 +04:00
CMakeLists.txt	add an ocl sample	2012-08-08 17:12:53 +08:00