Alexander Alekhin 0d6518aaa0 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 ...

OpenCV FFmpeg wrapper download links are preserved from ffmpeg/master branch

2018-06-13 19:34:44 +03:00

..

doc/pics

squashed #823

2015-04-24 21:58:14 +02:00

include/opencv2

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

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

misc/java

java: disable highgui wrapped code

2018-01-13 02:12:39 +00:00

src

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

2018-06-13 19:34:44 +03:00

test

ts: refactor OpenCV tests

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

CMakeLists.txt

update CMakeList.txt

2018-02-05 16:23:52 +03:00