Roman Donchenko 3939d78336 Merge remote-tracking branch 'origin/2.4' into merge-2.4 ...

Conflicts:
	modules/core/include/opencv2/core/types_c.h
	modules/gpu/src/cuda/imgproc.cu
	modules/gpu/src/cuda/safe_call.hpp
	modules/gpu/src/error.cpp
	modules/gpu/src/imgproc.cpp
	modules/imgproc/src/distransform.cpp
	modules/imgproc/src/shapedescr.cpp
	modules/python/src2/cv2.cpp
	modules/python/src2/cv2.cv.hpp

2013-07-22 18:38:57 +04:00

..

androidcamera

Merge remote-tracking branch 'origin/2.4'

2013-06-05 15:42:07 +04:00

bioinspired

updated doc wrt new bioinspired namespace convention

2013-07-15 09:58:16 +02:00

calib3d

removed tab in five-point.cpp

2013-07-18 10:09:50 +08:00

contrib

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

2013-07-22 18:38:57 +04:00

core

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

2013-07-22 18:38:57 +04:00

cudev

added stub library for cudev module

2013-07-12 08:47:12 +04:00

features2d

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

2013-07-22 18:38:57 +04:00

flann

Merge remote-tracking branch 'origin/2.4'

2013-05-21 17:19:23 +04:00

gpu

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

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

gpuarithm

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

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

gpubgsegm

fixed gpu performance tests:

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

gpucodec

fixed gpu performance tests:

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

gpufeatures2d

fixed gpu performance tests:

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

gpufilters

fixed gpu performance tests:

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

gpuimgproc

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

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

gpulegacy

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

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

gpuoptflow

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

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

gpustereo

fixed gpu performance tests:

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

gpuwarping

fixed gpu performance tests:

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

highgui

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

2013-07-22 18:38:57 +04:00

imgproc

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

2013-07-22 18:38:57 +04:00

java

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

2013-07-22 18:38:57 +04:00

legacy

Merge remote-tracking branch 'origin/2.4'

2013-05-21 17:19:23 +04:00

ml

Merge remote-tracking branch 'origin/2.4'

2013-06-19 15:25:37 +04:00

nonfree

SIFT+SURF PyDocs

2013-07-11 09:30:21 +05:30

objdetect

Add a new variant of detectMultiScale with output arguments 'objects' and 'numDetections'; factor most of detectMultiScale's code into 2 protected methods

2013-06-14 04:25:17 +04:00

ocl

Merge pull request #1155 from bitwangyaoyao:master_fix

2013-07-21 18:50:39 +04:00

photo

Merge pull request #1133 from abidrahmank:denoising_pydocs

2013-07-19 12:20:56 +04:00

python

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

2013-07-22 18:38:57 +04:00

softcascade

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

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

stitching

Merge remote-tracking branch 'origin/2.4'

2013-06-19 15:25:37 +04:00

superres

Merge pull request #1122 from SpecLad:merge-2.4

2013-07-21 18:46:27 +04:00

ts

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

2013-07-22 18:38:57 +04:00

video

bgdsubtractorGMG docs

2013-07-19 23:11:30 +05:30

videostab

refactored GoodFeaturesToTrackDetector

2013-07-17 11:39:56 +04:00

world

Make core/internal.hpp a private header

2013-04-01 17:29:10 +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