projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d2914ae af763da)
Merge branch 'collectd-4.2'
authorFlorian Forster <octo@huhu.verplant.org>
Tue, 8 Jan 2008 10:25:27 +0000 (11:25 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Tue, 8 Jan 2008 10:25:27 +0000 (11:25 +0100)
1  2 
src/collectd.conf.pod patch | diff1 | diff2 | blob | history

diff --cc src/collectd.conf.pod
Simple merge
collectd, the system statistics collection daemon