Merge branch 'master' of github.com:Yangqing/caffe
authorYangqing Jia <jiayq84@gmail.com>
Thu, 24 Oct 2013 17:40:02 +0000 (10:40 -0700)
committerYangqing Jia <jiayq84@gmail.com>
Thu, 24 Oct 2013 17:40:02 +0000 (10:40 -0700)
commitbdbf9f8c2856ff46d7e19f172da7e70b4420dc12
tree6b3a37b1e58cd72afe6428feb44b0018a3bbc9d9
parente850b2d5b1f43acb4cbd3663881eb9890c66d615
parent94efbe4a12ee6cd08bb5066b23fa0c6b5c37e816
Merge branch 'master' of github.com:Yangqing/caffe