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

..

androidcamera

Normalize line endings and whitespace

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

calib3d

Merge branch 2.4

2012-11-13 19:54:48 +04:00

contrib

Merge branch 2.4

2012-11-20 19:12:00 +04:00

core

Merge branch 2.4

2012-11-20 19:12:00 +04:00

features2d

Merge branch 2.4

2012-11-13 19:54:48 +04:00

flann

Merge branch '2.4'

2012-10-23 20:32:19 +04:00

gpu

Revert "Merge pull request #141 from jet47/gpu-pyrlk-fix" because this bug appears only in 2.4

2012-11-13 23:52:18 +04:00

highgui

Merge branch 2.4

2012-11-13 19:54:48 +04:00

imgproc

Merge branch 2.4

2012-11-13 19:54:48 +04:00

java

Merge branch 2.4

2012-11-20 19:12:00 +04:00

legacy

Merge branch 2.4

2012-11-13 19:54:48 +04:00

ml

Merge branch 2.4

2012-11-13 19:54:48 +04:00

nonfree

Merge branch 2.4

2012-11-13 19:54:48 +04:00

objdetect

Merge remote-tracking branch 'cuda-geek/soft-cascade-cpu'

2012-11-13 23:37:44 +04:00

ocl

fix the compilation bug of main.cpp in perf test and accuracy test on ocl module. It caused by the incompatibility of command line parser class in core.hpp between master branch and 2.4 branch.

2012-11-07 13:49:09 +08:00

photo

Merge branch 2.4

2012-11-13 19:54:48 +04:00

python

fixed 2 test failures (test_DrawChessboardCorners & Core_Array.expressions)

2012-10-24 14:41:15 +04:00

stitching

Merge branch 2.4

2012-11-13 19:54:48 +04:00

ts

Merge release 2.4.3

2012-11-02 17:58:02 +04:00

video

Merge pull request #128 from LeonidBeynenson/fix_args_calcOpticalFlowSF

2012-11-14 17:30:06 +04:00

videostab

Eliminate discrepancies between signatures in documentation and OpenCV headers

2012-10-18 13:03:12 +04:00

world

Normalize line endings and whitespace

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

CMakeLists.txt

Global CMake reorganization:

2012-02-03 11:26:49 +00:00

refman.rst.in

Made reference manual table of contents autogenerated

2012-05-30 14:06:47 +00:00