Alexander Alekhin 45dd575ed2 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 ...

Revert "documentation: avoid links to 'master' branch from 3.4 maintenance branch"
This reverts commit 9ba9358ecb.

Revert "documentation: avoid links to 'master' branch from 3.4 maintenance branch (2)"
This reverts commit f185802489.

2018-06-04 19:26:10 +03:00

..

calib3d

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2018-06-04 19:26:10 +03:00

core

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2018-06-04 19:26:10 +03:00

cudaarithm

cuda_meanStdDev : bug fix

2018-05-16 03:31:47 +09:00

cudabgsegm

cuda: eliminate part of build warnings

2018-04-05 17:53:22 +03:00

cudacodec

cuda: eliminate part of build warnings

2018-04-05 17:53:22 +03:00

cudafeatures2d

next: drop CV_CXX11 conditions

2018-04-10 18:09:54 +03:00

cudafilters

Merge pull request #11483 from nglee:dev_cudaCannyStreamIssue

2018-05-09 23:44:34 +03:00

cudaimgproc

Merge pull request #11483 from nglee:dev_cudaCannyStreamIssue

2018-05-09 23:44:34 +03:00

cudalegacy

cuda: eliminate part of build warnings

2018-04-05 17:53:22 +03:00

cudaobjdetect

Misc. modules/ cont. pt2

2018-02-13 11:28:11 -05:00

cudaoptflow

ts: refactor OpenCV tests

2018-02-03 19:39:47 +00:00

cudastereo

fix build error on Jetson

2018-03-28 18:21:53 +09:00

cudawarping

ts: refactor OpenCV tests

2018-02-03 19:39:47 +00:00

cudev

fix CUDA build crash

2018-04-11 17:19:09 +09:00

dnn

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2018-06-04 19:26:10 +03:00

features2d

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2018-06-04 19:26:10 +03:00

flann

flann: apply CV_OVERRIDE/CV_FINAL

2018-03-28 18:43:27 +03:00

highgui

documentation: avoid links to 'master' branch from 3.4 maintenance branch

2018-05-31 16:45:18 +03:00

imgcodecs

Merge pull request #11565 from alalek:issue_11545

2018-05-22 16:00:37 +00:00

imgproc

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2018-06-04 19:26:10 +03:00

java

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2018-05-14 15:17:35 +03:00

js

Misc. modules/ typos (cont.)

2018-02-12 10:15:36 -05:00

ml

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2018-05-14 15:17:35 +03:00

objdetect

documentation: avoid links to 'master' branch from 3.4 maintenance branch

2018-05-31 16:45:18 +03:00

photo

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2018-05-28 11:22:55 +00:00

python

python: eliminate pylint warnings

2018-06-04 17:58:06 +03:00

shape

shape: apply CV_OVERRIDE/CV_FINAL

2018-03-28 18:43:27 +03:00

stitching

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2018-05-21 16:20:14 +03:00

superres

build: unreachable code after CV_Error()

2018-04-23 15:45:57 +03:00

ts

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2018-06-04 19:26:10 +03:00

video

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2018-04-24 18:13:06 +03:00

videoio

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2018-06-04 19:26:10 +03:00

videostab

build: unreachable code after CV_Error()

2018-04-23 15:45:57 +03:00

viz

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2018-06-04 19:26:10 +03:00

world

Do not build protobuf without dnn (#10689)

2018-02-01 16:30:23 +03:00

CMakeLists.txt

cmake: allow providing list of extra modules paths

2018-02-01 19:02:02 +03:00