Roman Donchenko 2530b580a8 Merge branch 'master' into merge-2.4 ...

Conflicts:
	modules/photo/doc/inpainting.rst

2013-08-16 14:14:12 +04:00

..

androidcamera

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-08-13 12:56:39 +04:00

bioinspired

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-08-13 12:56:39 +04:00

calib3d

Merge branch 'master' into merge-2.4

2013-08-16 14:14:12 +04:00

contrib

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-08-13 12:56:39 +04:00

core

Merge branch 'master' into merge-2.4

2013-08-16 14:14:12 +04:00

cudev

added cudev::GpuMat_<T> support to Input/Output arrays

2013-07-22 10:33:40 +04:00

features2d

Merge branch 'master' into merge-2.4

2013-08-16 14:14:12 +04:00

flann

Merge remote-tracking branch 'origin/2.4'

2013-08-06 13:56:49 +04:00

gpu

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-08-13 12:56:39 +04:00

gpuarithm

Merge pull request #1032 from jet47:gpuarithm-remove-obsolete-api

2013-07-21 18:45:47 +04:00

gpubgsegm

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-08-13 12:56:39 +04:00

gpucodec

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-08-13 12:56:39 +04:00

gpufeatures2d

fixed gpu performance tests:

2013-07-16 15:43:04 +04:00

gpufilters

Merge branch 'master' into merge-2.4

2013-08-16 14:14:12 +04:00

gpuimgproc

Merge branch 'master' into merge-2.4

2013-08-16 14:14:12 +04:00

gpulegacy

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-06-25 15:55:52 +04:00

gpuoptflow

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-08-13 12:56:39 +04:00

gpustereo

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-08-13 12:56:39 +04:00

gpuwarping

added cudev::GpuMat_<T> support to Input/Output arrays

2013-07-22 10:33:40 +04:00

highgui

Merge branch 'master' into merge-2.4

2013-08-16 14:14:12 +04:00

imgproc

Merge branch 'master' into merge-2.4

2013-08-16 14:14:12 +04:00

java

Fixed compilation errors.

2013-08-06 18:07:08 +04:00

legacy

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-08-13 12:56:39 +04:00

ml

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-08-13 12:56:39 +04:00

nonfree

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-08-13 12:56:39 +04:00

objdetect

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-08-13 12:56:39 +04:00

ocl

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-08-13 12:56:39 +04:00

optim

Minor fixes

2013-07-30 04:14:36 +03:00

photo

Merge branch 'master' into merge-2.4

2013-08-16 14:14:12 +04:00

python

Merge pull request #1204 from berak:Bug_3170

2013-07-30 16:13:03 +04:00

softcascade

Merge pull request #1095 from jet47:gpu-perf-tests

2013-07-18 19:32:37 +04:00

stitching

Merge branch 'master' into merge-2.4

2013-08-16 14:14:12 +04:00

superres

Merge remote-tracking branch 'origin/2.4'

2013-08-06 13:56:49 +04:00

ts

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-08-13 12:56:39 +04:00

video

Merge branch 'master' into merge-2.4

2013-08-16 14:14:12 +04:00

videostab

Merge remote-tracking branch 'origin/2.4'

2013-08-06 13:56:49 +04:00

world

Remove HAVE_CVCONFIG_H - it's always defined.

2013-07-10 16:02:07 +04:00

CMakeLists.txt

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-06-10 18:18:01 +04:00

refman.rst.in

Made reference manual table of contents autogenerated

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