Alexander Alekhin 1913482cf5 Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2018-11-10 20:50:26 +00:00

..

include/opencv2

removed C API in the following modules: photo, video, imgcodecs, videoio (#13060)

2018-11-09 00:52:09 +03:00

misc/java/test

java(test): fix test names

2018-01-12 19:14:00 +00:00

perf

Merge pull request #11897 from Jakub-Golinowski:hpx_backend

2018-08-31 16:23:26 +03:00

src

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

2018-11-10 20:50:26 +00:00

test

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

2018-11-02 05:33:35 +00:00

CMakeLists.txt

Merge pull request #12192 from pasbi:pfm

2018-08-13 13:14:12 +03:00