Merge pull request #2410 from sguada/datum_transform
authorJeff Donahue <jeff.donahue@gmail.com>
Sat, 30 May 2015 04:35:30 +0000 (21:35 -0700)
committerJeff Donahue <jeff.donahue@gmail.com>
Sat, 30 May 2015 04:35:30 +0000 (21:35 -0700)
Datum transform

1  2 
src/caffe/layers/base_data_layer.cpp
src/caffe/proto/caffe.proto

Simple merge
Simple merge