Alexander Alekhin 82c477c9f7 Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2018-07-31 21:35:00 +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-31 21:35:00 +03:00
misc	Replace std::vector<char> to std::vector<uchar> for Java bindings of dnn importers	2018-07-11 18:58:56 +03:00
perf	Enable FastNeuralStyle and OpenFace networks with IE backend	2018-06-09 15:57:12 +03:00
src	Merge pull request #12113 from dkurt:dnn_fix_ssd_on_myriad	2018-07-31 14:55:18 +00:00
test	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2018-07-31 21:35:00 +03:00
CMakeLists.txt	dnn: modified IE search, R2 compatibility fixed	2018-07-31 14:48:06 +03:00