Merge branch 'master' into patch_1
authorPrzemysław Dolata <snowball91b@gmail.com>
Tue, 21 Aug 2018 11:16:02 +0000 (13:16 +0200)
committerWook Song <wook16.song@samsung.com>
Thu, 23 Jan 2020 13:53:29 +0000 (22:53 +0900)
commit5a2f07d2174f51814691e2fd07e4354bfce8567b
tree53f9ff8bef9b1ff59ba3e6249e4ce8f6029fe1c1
parent80ba9cb5942f5758f4c6f90d743a4894c3b0c03b
parentb8e927ac6fe4f7ada69358879d82e7aebbb4f0f7
Merge branch 'master' into patch_1
src/caffe/layers/pooling_layer.cpp
src/caffe/net.cpp
src/caffe/proto/caffe.proto