projects
/
platform
/
upstream
/
caffeonacl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b258956
b2b1e99
)
Merge pull request #378 from longjon/no-merge-duplicates
author
Jeff Donahue
<jeff.donahue@gmail.com>
Wed, 30 Apr 2014 19:53:32 +0000
(12:53 -0700)
committer
Jeff Donahue
<jeff.donahue@gmail.com>
Wed, 30 Apr 2014 19:53:32 +0000
(12:53 -0700)
Note the last added layer/params in caffe.proto to prevent conflicts
Trivial merge