Alexander Alekhin 0d6518aaa0 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 ... OpenCV FFmpeg wrapper download links are preserved from ffmpeg/master branch		2018-06-13 19:34:44 +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-13 19:34:44 +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 #11739 from dkurt:more_ie_models	2018-06-13 13:26:50 +00:00
test	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2018-06-13 19:34:44 +03:00
CMakeLists.txt	dnn: allow setting IE paths via command line	2018-05-22 14:40:03 +03:00