Alexander Alekhin 7e2ebecd52 Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2019-01-10 12:29:41 +03:00
..
cmake/hooks	dnn: make OpenCL DNN code optional	2018-03-01 12:12:40 +03:00
include/opencv2	Merge branch '3.4' into merge-3.4	2018-12-22 05:40:15 +00: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-12-06 07:06:58 +00:00
src	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-01-10 12:29:41 +03:00
test	dnn: fixup missing vkcom/vulkan combination of backend/target in dnn test	2018-12-24 11:00:45 +08:00
CMakeLists.txt	dnn: reduce set of ignored warnings	2018-11-15 13:15:59 +03:00