Merge branch 2.4
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Tue, 20 Nov 2012 15:12:00 +0000 (19:12 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Tue, 20 Nov 2012 15:12:00 +0000 (19:12 +0400)
commit7f542e391aa75301333f1a8a6a36f5f6484a5425
tree77748eb24f7b66599299bbe95e335aeede7c010d
parent2e2d92727308f222860202c6b611acf0c83532bb
parentd559c18ee5836ad5c76ef64e16f13b672f96767f
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
modules/contrib/include/opencv2/contrib/contrib.hpp
modules/contrib/src/detection_based_tracker.cpp
modules/core/include/opencv2/core/core.hpp