Merge pull request #1167 from Yangqing/factory
authorYangqing Jia <jiayq84@gmail.com>
Tue, 30 Sep 2014 17:35:39 +0000 (10:35 -0700)
committerYangqing Jia <jiayq84@gmail.com>
Tue, 30 Sep 2014 17:35:39 +0000 (10:35 -0700)
Layer factory.

1  2 
Makefile
src/caffe/layer_factory.cpp

diff --cc Makefile
Simple merge
Simple merge