Merge branch 'master' of github.com:Yangqing/caffe
authorYangqing Jia <jiayq84@gmail.com>
Wed, 25 Sep 2013 22:39:38 +0000 (15:39 -0700)
committerYangqing Jia <jiayq84@gmail.com>
Wed, 25 Sep 2013 22:39:38 +0000 (15:39 -0700)
commitb5e50def468c0ec7b745fb82e0e41707aec8e1c1
tree2ac2fb4eed764ddd8f809717c2e934f99f867f1a
parent5ae65372e4d889e01aff1588cd566afaeadfe0ed
parent8025b8b9b7c27749505090f14de786e6377e7c79
Merge branch 'master' of github.com:Yangqing/caffe