Alexander Alekhin 68c92908d5 Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2018-05-14 15:17:35 +03:00
..
cmake/hooks	dnn: make OpenCL DNN code optional	2018-03-01 12:12:40 +03:00
include/opencv2	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2018-05-03 14:30:38 +00:00
misc	python: better Python 3 support	2018-05-11 17:32:04 +03:00
perf	Enable some tests for clDNN plugin from Intel's Inference Engine	2018-04-20 10:47:46 +03:00
src	Fuse multipliers but not convolution layers weights	2018-05-10 19:24:38 +03:00
test	python: better Python 3 support	2018-05-11 17:32:04 +03:00
CMakeLists.txt	cmake: disable checks for protobuf generated files	2018-03-28 18:43:28 +03:00