opencv

History

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

libinfo

Libinfo build fix;

2012-11-20 17:39:45 +04:00

package

Normalize line endings and whitespace

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

scripts

Issue #2537 OpenCV Manager doesn't work on Android 4.2 fixed.

2012-11-16 17:01:25 +04:00

service

Merge branch 2.4