Merge pull request #10139 from alalek:dnn_rename_caffe_proto_package
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 23 Nov 2017 14:10:42 +0000 (14:10 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 23 Nov 2017 14:10:42 +0000 (14:10 +0000)
1  2 
modules/dnn/src/caffe/caffe_io.hpp

Simple merge