[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 75fe98d 9889df0)
Merge branch 'ff/owfs'
authorFlorian Forster <octo@noris.net>
Wed, 23 Jul 2008 15:17:49 +0000 (17:17 +0200)
committerFlorian Forster <octo@noris.net>
Wed, 23 Jul 2008 15:17:49 +0000 (17:17 +0200)
1  2 
src/collectd.conf.pod patch | diff1 | diff2 | blob | history

diff --cc src/collectd.conf.pod
Simple merge
statistics collection and monitoring daemon (clone)