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

Conflicts:
	modules/core/include/opencv2/core/version.hpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/initialization.cpp
	modules/ocl/test/main.cpp
	modules/superres/CMakeLists.txt
	modules/superres/src/input_array_utility.cpp
	modules/superres/src/input_array_utility.hpp
	modules/superres/src/optical_flow.cpp

2013-07-16 11:52:41 +04:00

..

androidcamera

Merge remote-tracking branch 'origin/2.4'

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

calib3d

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

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

contrib

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

2013-07-03 19:53:21 +04:00

core

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

2013-07-16 11:52:41 +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-16 11:52:41 +04:00

flann

Merge remote-tracking branch 'origin/2.4'

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

gpu

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

2013-07-03 19:53:21 +04:00

gpuarithm

fixed warnings in gpu modules from VS 2012

2013-07-03 22:21:10 +04:00

gpubgsegm

refactored Morphology Filters

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

gpucodec

refactored VideoReader (convert it to abstract interface)

2013-06-11 17:57:40 +04:00

gpufeatures2d

refactored Separable Linear Filters

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

gpufilters

fix gpu::DeviceInfo compilation under linux

2013-06-24 10:11:44 +04:00

gpuimgproc

refactored Separable Linear Filters

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

gpulegacy

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

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

gpuoptflow

fix gpu::DeviceInfo compilation under linux

2013-06-24 10:11:44 +04:00

gpustereo

fixed warnings in gpu modules from VS 2012

2013-07-03 22:21:10 +04:00

gpuwarping

updated documentation

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

highgui

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

2013-07-16 11:52:41 +04:00

imgproc

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

2013-07-16 11:52:41 +04:00

java

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

2013-07-08 18:47:38 +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 remote-tracking branch 'origin/2.4' into merge-2.4

2013-07-16 11:52:41 +04:00

photo

renamed gpu_private.hpp to private.gpu.hpp

2013-06-10 12:40:32 +04:00

python

drawMatches python bindings

2013-07-11 09:28:37 +05:30

softcascade

added missing <iostream> header

2013-06-10 17:47:55 +04:00

stitching

Merge remote-tracking branch 'origin/2.4'

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

superres

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

2013-07-16 11:52:41 +04:00

ts

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

2013-07-16 11:52:41 +04:00

video

Merge remote-tracking branch 'origin/2.4'

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

videostab

Merge remote-tracking branch 'origin/2.4'

2013-06-19 15:25:37 +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