Alexander Alekhin 4560909a5e Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2018-07-17 19:27:48 +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-17 19:27:48 +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 #11104 from asciian:reading_from_stream	2018-07-17 16:24:06 +00:00
test	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2018-07-17 19:27:48 +03:00
CMakeLists.txt	dnn: allow to use external protobuf	2018-07-09 17:28:45 +03:00