Merge branch 'master' of github.com:Yangqing/caffe
authorYangqing Jia <jiayq84@gmail.com>
Tue, 12 Nov 2013 01:08:27 +0000 (17:08 -0800)
committerYangqing Jia <jiayq84@gmail.com>
Tue, 12 Nov 2013 01:08:27 +0000 (17:08 -0800)
commit652d744360fb317a41e0456c0d1226262c5a70d4
treed74f78a0ec4917d51a8674804f0535d625f57901
parent76bf486e3de96fe6f5619693742e5c1bb19074b2
parentc8e7cce7316c29b32d0b2dcdc98bff75afa0ab40
Merge branch 'master' of github.com:Yangqing/caffe

Conflicts:
Makefile
Makefile