projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ad28576 835a087)
Merge remote branch 'jeromer/master'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 16 Jun 2010 12:23:43 +0000 (14:23 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 16 Jun 2010 12:23:43 +0000 (14:23 +0200)
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