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

Conflicts:
	cmake/OpenCVDetectPython.cmake
	cmake/OpenCVModule.cmake
	modules/core/src/gpumat.cpp
	modules/cudaimgproc/test/test_hough.cpp
	modules/gpu/CMakeLists.txt
	modules/gpu/src/cuda/generalized_hough.cu
	modules/gpu/src/generalized_hough.cpp
	modules/python/CMakeLists.txt

2014-01-27 15:28:14 +04:00

..

androidcamera

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

2014-01-27 15:28:14 +04:00

calib3d

Merge pull request #2158 from KonstantinMatskevich:testdata_path_calib3d

2014-01-20 23:35:06 +04:00

contrib

deleted excess semicolons, commas

2014-01-18 01:31:33 +04:00

core

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

2014-01-27 15:28:14 +04:00

cuda

deleted excess semicolons, commas

2014-01-18 01:31:33 +04:00

cudaarithm

Merge commit '05b9c991dd' into merge-2.4

2013-12-30 17:30:59 +04:00

cudabgsegm

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

2013-12-03 17:35:21 +04:00

cudacodec

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

2013-12-03 17:35:21 +04:00

cudafeatures2d

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

2013-12-03 17:35:21 +04:00

cudafilters

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

2013-12-03 17:35:21 +04:00

cudaimgproc

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

2014-01-14 11:53:59 +04:00

cudalegacy

deleted excess semicolons, commas

2014-01-18 01:31:33 +04:00

cudaoptflow

Merge commit '05b9c991dd' into merge-2.4

2013-12-30 17:30:59 +04:00

cudastereo

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

2013-12-03 17:35:21 +04:00

cudawarping

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

2013-12-03 17:35:21 +04:00

cudev

Removed another usage of __func__, following #1763.

2013-11-11 17:02:50 +04:00

features2d

Merge pull request #2027 from AD-530:brief_cl

2014-01-27 09:49:46 +04:00

flann

deleted excess semicolons, commas

2014-01-18 01:31:33 +04:00

highgui

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

2014-01-27 15:28:14 +04:00

imgproc

fixed

2014-01-24 11:41:23 +04:00

java

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

2014-01-27 15:28:14 +04:00

legacy

deleted excess semicolons, commas

2014-01-18 01:31:33 +04:00

matlab

Replace $(Configuration) with $<CONFIGURATION>

2013-10-24 18:20:16 +01:00

ml

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

2014-01-27 15:28:14 +04:00

nonfree

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

2014-01-14 11:53:59 +04:00

objdetect

deleted excess semicolons, commas

2014-01-18 01:31:33 +04:00

ocl

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

2014-01-27 15:28:14 +04:00

optim

Merge pull request #1521 from nailbiter:optimCG

2013-10-29 16:14:32 +04:00

photo

deleted excess semicolons, commas

2014-01-18 01:31:33 +04:00

python

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

2014-01-27 15:28:14 +04:00

shape

Merge pull request #1567 from ilya-lavrenov:warn_fix

2013-10-08 13:50:49 +04:00

softcascade

deleted excess semicolons, commas

2014-01-18 01:31:33 +04:00

stitching

fix

2014-01-25 11:50:28 +04:00

superres

Merge pull request #2177 from ilya-lavrenov:ocl_superres

2014-01-21 17:05:50 +04:00

ts

Merge pull request #2190 from KonstantinMatskevich:ocl_dumpinfo

2014-01-24 16:44:19 +04:00

video

Unused code removed

2014-01-24 17:37:54 +04:00

videostab

Code review fixes.

2013-12-23 11:34:46 +04:00

viz

review comments

2014-01-20 15:22:58 +04:00

world

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

2013-11-11 16:55:36 +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

…