projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c71b8d2 92445ff)
Merge branch 'master' of git://git.verplant.org/collectd
authorFlorian Forster <octo@noris.net>
Wed, 23 Jul 2008 15:18:13 +0000 (17:18 +0200)
committerFlorian Forster <octo@noris.net>
Wed, 23 Jul 2008 15:18:13 +0000 (17:18 +0200)
1  2 
src/Makefile.am patch | diff1 | diff2 | blob | history
src/collectd.conf.pod patch | diff1 | diff2 | blob | history

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