projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7596ace 22b7037)
Merge branch 'pull/master'
authorFlorian octo Forster <octo@dev4.office.noris.de>
Wed, 27 Feb 2008 09:24:03 +0000 (10:24 +0100)
committerFlorian octo Forster <octo@dev4.office.noris.de>
Wed, 27 Feb 2008 09:24:03 +0000 (10:24 +0100)
1  2 
src/collectd.c patch | diff1 | diff2 | blob | history

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