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
2012-11-20 19:12:00 +04:00
2012-11-20 19:12:00 +04:00
2012-11-07 03:19:04 +04:00
2012-11-20 19:12:00 +04:00
2012-11-20 19:12:00 +04:00
2012-11-20 19:12:00 +04:00
2012-08-28 17:46:45 +04:00
2012-06-21 14:50:05 +00:00
2012-07-24 17:59:55 +04:00

OpenCV: open source computer vision library

Homepage:    http://opencv.org
Online docs: http://docs.opencv.org
Q&A forum:   http://answers.opencv.org
Dev zone:    http://code.opencv.org
Description
No description provided
Readme 422 MiB
Languages
C++ 83.4%
Cuda 5.9%
C 3.8%
Java 2.4%
CMake 2.2%
Other 2.1%