Alexander Alekhin 2da96be217 Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2018-07-09 19:44:51 +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-07-09 19:44:51 +03:00
misc	fix doc.	2018-06-03 17:44:24 +08:00
perf	Enable FastNeuralStyle and OpenFace networks with IE backend	2018-06-09 15:57:12 +03:00
src	Merge pull request #11924 from alalek:dnn_ocl_fix_max_pool_forward	2018-07-09 16:25:34 +00:00
test	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2018-07-09 19:44:51 +03:00
CMakeLists.txt	dnn: allow to use external protobuf	2018-07-09 17:28:45 +03:00