projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fe9c4ee 57d32cd)
Merge branch 'collectd-4.1' into collectd-4.2
authorFlorian Forster <octo@huhu.verplant.org>
Mon, 21 Jan 2008 17:28:27 +0000 (18:28 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Mon, 21 Jan 2008 17:28:27 +0000 (18:28 +0100)
1  2 
src/collectd-exec.pod patch | diff1 | diff2 | blob | history
src/logfile.c patch | diff1 | diff2 | blob | history

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