Alexander Alekhin 3165baa1f1 Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2018-07-02 14:58:29 +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-06-25 22:03:17 +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 #11854 from dkurt:dnn_tf_data_layouts_v2	2018-06-29 15:02:22 +00:00
test	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2018-07-02 14:58:29 +03:00
CMakeLists.txt	temporarily disabled OpenCL use in DNN module on Mac (#11828)	2018-06-26 09:35:18 +03:00