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

Conflicts:
	modules/calib3d/include/opencv2/calib3d/calib3d.hpp
	modules/core/include/opencv2/core/core.hpp
	modules/core/include/opencv2/core/cuda/limits.hpp
	modules/core/include/opencv2/core/internal.hpp
	modules/core/src/matrix.cpp
	modules/nonfree/test/test_features2d.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/hog.cpp
	modules/ocl/test/test_haar.cpp
	modules/ocl/test/test_objdetect.cpp
	modules/ocl/test/test_pyrup.cpp
	modules/ts/src/precomp.hpp
	samples/ocl/facedetect.cpp
	samples/ocl/hog.cpp
	samples/ocl/pyrlk_optical_flow.cpp
	samples/ocl/surf_matcher.cpp

2013-06-25 15:55:52 +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

Compile OpenCV with GCC visibility set to hidden

2013-05-13 18:33:20 +04:00

core

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

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

features2d

Merge remote-tracking branch 'origin/2.4'

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

flann

Merge remote-tracking branch 'origin/2.4'

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

gpu

fix gpu warnings with signed/unsigned char

2013-06-18 17:44:49 +04:00

gpuarithm

updated documentation

2013-06-17 09:53:39 +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

removed obsolete API

2013-06-20 11:24:29 +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

renamed gpu_private.hpp to private.gpu.hpp

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

gpustereo

updated documentation

2013-06-18 08:36:49 +04:00

gpuwarping

renamed gpu_private.hpp to private.gpu.hpp

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

highgui

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

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

imgproc

Merge remote-tracking branch 'origin/2.4'

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

java

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

2013-06-25 15:55:52 +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

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

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

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-06-25 15:55:52 +04:00

photo

renamed gpu_private.hpp to private.gpu.hpp

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

python

Updated usage of METH_X definitions for python 3.

2013-06-13 20:10:01 -04:00

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

refactored Separable Linear Filters

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

ts

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

2013-06-25 15:55:52 +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