Merge pull request #1172 from Yangqing/conv_factory
authorYangqing Jia <jiayq84@gmail.com>
Mon, 29 Sep 2014 00:40:45 +0000 (17:40 -0700)
committerYangqing Jia <jiayq84@gmail.com>
Mon, 29 Sep 2014 00:40:45 +0000 (17:40 -0700)
Pooling factory

1  2 
src/caffe/layer_factory.cpp

Simple merge