fixes after rebase
authorqipeng <pengrobertqi@163.com>
Wed, 30 Jul 2014 02:56:36 +0000 (19:56 -0700)
committerJeff Donahue <jeff.donahue@gmail.com>
Mon, 1 Sep 2014 18:33:41 +0000 (11:33 -0700)
commit23d44308692e469bd7b587d1697ac68068986608
treeb174f954dd4f2162db093017a125f3da3e76d972
parent3f7a910e05c1ee6e9d09ac201831592357fc18ee
fixes after rebase
src/caffe/proto/caffe.proto
src/caffe/solver.cpp