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

2018-09-28 14:14:47 +03:00

..

doc/pics

Removed Sphinx documentation files

2014-12-26 19:12:19 +03:00

include/opencv2

Merge pull request #12310 from cv3d:chunks/enum_interface

2018-09-21 18:12:35 +03:00

misc

Merge pull request #12310 from cv3d:chunks/enum_interface

2018-09-21 18:12:35 +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-28 14:14:47 +03:00

test

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

2018-09-14 23:44:35 +00:00

CMakeLists.txt

Merge pull request #9466 from huningxin:js

2017-09-25 16:52:07 +03:00