tokkee.org
Code
projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6f7f918
9927470
)
octo@leeloo:~/collectd $ svn merge -r822:823 branches/disk-linux trunk
author
octo
<octo>
Fri, 16 Jun 2006 23:02:01 +0000
(23:02 +0000)
committer
octo
<octo>
Fri, 16 Jun 2006 23:02:01 +0000
(23:02 +0000)
Trivial merge
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}