modified:   include/caffe/solver.hpp
	modified:   src/caffe/layers/data_layer.cpp
	modified:   src/caffe/proto/caffe.proto
	modified:   src/caffe/solver.cpp
	new file:   include/caffe/info.hpp