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)
commitd566c0bcbac805ff747563ded7ce860b9bde49c9
treee17f5efb02c7a80ebede21b4d9dfb1b28def009c
parent20dde61d73785f25ac19acf542539b6cf2ed297c
parent8500c5537f7a1193b1437f41b34478af77b051fd
Merge branch 'master' of github.com:Yangqing/caffe
src/caffe/layers/data_layer.cpp