Alexander Alekhin 73bfe68821 Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2018-09-07 12:40:27 +03:00

..

doc/pics

…

include/opencv2

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

2018-08-20 19:30:18 +03:00

misc/java/test

Merge pull request #12279 from savuor:cvtcolor_bgr2gray_8u_15bits

2018-09-06 13:28:24 +03: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-09-07 12:40:27 +03:00

test

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

2018-09-07 12:40:27 +03:00

CMakeLists.txt

…