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)
commit49a5280198dec6d2e0e333cedf22bb1e6f067c9d
treeab1900edb0670fe19310dc41f3befece09087b15
parente5d1790b7bab5d9be5221bdb61fc26106ed2d33e
parentb29893b938402794b7f3a10c3df5e23e428d2b64
Merge pull request #10139 from alalek:dnn_rename_caffe_proto_package
modules/dnn/src/caffe/caffe_io.hpp