Merge pull request #9569 from dkurt:test_dnn_ssd_halide
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 13 Sep 2017 13:29:50 +0000 (13:29 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 13 Sep 2017 13:29:50 +0000 (13:29 +0000)
1  2 
modules/dnn/include/opencv2/dnn/dnn.hpp
modules/dnn/src/dnn.cpp

Simple merge