]> Gitweb @ Texas Instruments - Open Source Git Repositories - git.TI.com/gitweb - jacinto-ai/caffe-jacinto.git/commitdiff
Merge branch 'master' of github.com:Yangqing/caffe
authorYangqing Jia <jiayq84@gmail.com>
Mon, 14 Oct 2013 18:29:54 +0000 (11:29 -0700)
committerYangqing Jia <jiayq84@gmail.com>
Mon, 14 Oct 2013 18:29:54 +0000 (11:29 -0700)
1  2 
src/caffe/layers/data_layer.cpp

Simple merge