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

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

..

cmake/hooks

dnn: make OpenCL DNN code optional

2018-03-01 12:12:40 +03:00

include/opencv2

Merge pull request #12703 from wzw-intel:vkcom

2018-10-29 17:51:26 +03:00

misc

dnn(tensorflow): re-generate files using protoc

2018-09-12 21:33:45 +03:00

perf

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

2018-10-15 20:15:42 +00: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-10 20:50:26 +00:00

CMakeLists.txt

Fix #12542 (#12603)

2018-09-26 16:08:51 +03:00