Merge branch 'master' of github.com:Yangqing/caffe
authorYangqing Jia <jiayq84@gmail.com>
Tue, 19 Nov 2013 00:06:37 +0000 (16:06 -0800)
committerYangqing Jia <jiayq84@gmail.com>
Tue, 19 Nov 2013 00:06:37 +0000 (16:06 -0800)
commit4dae5e8fb7e4ce44d4be8956eb393ee015b3f70f
treee41d7d1c396316ae79fe6c2a7a58278661861645
parent91254090bd348398bffb7672a5d4e23ecd09e23c
parent3b187e0f6c174c6cc35708b978b70d1a7a6c5e20
Merge branch 'master' of github.com:Yangqing/caffe