Merge branch 'master' of github.com:Yangqing/caffe
authorYangqing Jia <jiayq84@gmail.com>
Sat, 26 Oct 2013 16:45:52 +0000 (09:45 -0700)
committerYangqing Jia <jiayq84@gmail.com>
Sat, 26 Oct 2013 16:45:52 +0000 (09:45 -0700)
commit0d752824e8c2c1dc1d23ca60b9ef28d28329fbc5
tree5b834673117bffe16bef39991a0db92fc70d720a
parent4448edf00d84f22f623321d32f2ca36e2a1fc836
parent7d2109f60364b11cdd3d293a70486f373511b985
Merge branch 'master' of github.com:Yangqing/caffe