Roman Donchenko 2c4bbb313c Merge commit '43aec5ad' into merge-2.4 ...

Conflicts:
	cmake/OpenCVConfig.cmake
	cmake/OpenCVLegacyOptions.cmake
	modules/contrib/src/retina.cpp
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/video.rst
	modules/gpu/src/speckle_filtering.cpp
	modules/python/src2/cv2.cv.hpp
	modules/python/test/test2.py
	samples/python/watershed.py

2013-08-27 13:26:44 +04:00

..

androidcamera

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

bioinspired

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

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

calib3d

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

contrib

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

core

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

cudev

Merge pull request #1296 from jet47:gpu-cvtcolor-fix-master

2013-08-19 14:26:12 +04:00

features2d

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

flann

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

gpu

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

gpuarithm

Merge commit '43aec5ad^' into merge-2.4

2013-08-27 13:23:26 +04:00

gpubgsegm

Merge pull request #1298 from jet47:gpu-eliminate-doubles

2013-08-20 18:04:54 +04:00

gpucodec

Merge pull request #1297 from SpecLad:merge-2.4

2013-08-20 14:10:22 +04:00

gpufeatures2d

eliminate unnecessary double arithmetics in CUDA

2013-08-19 15:56:45 +04:00

gpufilters

added cvconfig.hpp header file to gpu tests

2013-08-19 12:46:57 +04:00

gpuimgproc

eliminate unnecessary double arithmetics in CUDA

2013-08-19 15:56:45 +04:00

gpulegacy

added cvconfig.hpp header file to gpu tests

2013-08-19 12:46:57 +04:00

gpuoptflow

eliminate unnecessary double arithmetics in CUDA

2013-08-19 15:56:45 +04:00

gpustereo

added cvconfig.hpp header file to gpu tests

2013-08-19 12:46:57 +04:00

gpuwarping

added cvconfig.hpp header file to gpu tests

2013-08-19 12:46:57 +04:00

highgui

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

imgproc

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

java

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

legacy

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

ml

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

nonfree

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

objdetect

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

ocl

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

optim

Minor fixes

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

photo

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

python

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

softcascade

eliminate unnecessary double arithmetics in CUDA

2013-08-19 15:56:45 +04:00

stitching

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

superres

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

ts

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

video

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

videostab

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

world

Deleted all trailing whitespace.

2013-08-21 18:59:24 +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

…