projects
/
platform
/
upstream
/
caffe.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7b54598
c1faaa3
)
Merge pull request #859 from beam2d/fix-cifar-lrn-region
author
Jeff Donahue
<jeff.donahue@gmail.com>
Tue, 5 Aug 2014 16:22:49 +0000
(09:22 -0700)
committer
Jeff Donahue
<jeff.donahue@gmail.com>
Tue, 5 Aug 2014 16:22:49 +0000
(09:22 -0700)
Fix conflict on setting of LRN layers between train/test net and deploy net
Trivial merge