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

Conflicts:
	modules/core/src/gl_core_3_1.cpp
	modules/core/src/opencl/convert.cl
	modules/cudaimgproc/src/cuda/canny.cu
	modules/cudastereo/perf/perf_stereo.cpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpu/test/test_denoising.cpp
	modules/ocl/src/opencl/imgproc_resize.cl
	samples/cpp/Qt_sample/main.cpp

2014-02-17 15:24:05 +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 #2002 from abak:stereo_calibrate

2014-02-05 17:47:27 +04:00

contrib

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

2014-02-17 15:24:05 +04:00

core

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

2014-02-17 15:24:05 +04:00

cuda

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

2014-02-11 12:05:01 +04:00

cudaarithm

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

2014-02-11 12:05:01 +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-02-17 15:24:05 +04:00

cudalegacy

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

2014-02-03 13:23:59 +04:00

cudaoptflow

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

2014-02-17 15:24:05 +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 #2337 from pmoulon:master

2014-02-17 12:24:48 +04:00

flann

Merge pull request #2031 from berak:b_flann_timer_30

2014-02-03 17:00:21 +04:00

highgui

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

2014-02-17 15:24:05 +04:00

imgproc

fixed OpenCL kernel flag in resize (thanks to Ilya L)

2014-02-13 17:37:42 +04:00

java

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

2014-02-17 15:24:05 +04:00

legacy

features2d

2014-02-04 16:55:07 +04:00

matlab

Use CMAKE_CFG_INTDIR meta-variable to get the library output directory of the opencv_matlab.

2014-02-13 23:53:58 +08:00

ml

Fixed alignment

2014-01-30 16:43:56 +02:00

nonfree

fix nonfree module compilation without CUDA

2014-02-07 13:40:37 +04:00

objdetect

Merge pull request #2324 from vpisarev:fix_facedetect

2014-02-13 11:46:24 +04:00

optim

Merge pull request #1521 from nailbiter:optimCG

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

photo

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

2014-02-17 15:24:05 +04:00

python

bug fix for issue 3470

2014-02-03 14:46:22 +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

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

2014-02-11 12:05:01 +04:00

superres

added perf test

2014-02-05 20:24:30 +04:00

ts

cleaned up super_resolution sample from old OCL

2014-02-05 00:28:10 +04:00

video

Merge pull request #2252 from ilya-lavrenov:ocl_ref

2014-02-04 16:34:28 +04:00

videostab

Code review fixes.

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

viz

modified viz module header layout for 2.4 compatibility

2014-02-02 16:23:34 +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

…