projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fe9c4ee 2a7cae2)
Merge branch 'collectd-4.1' into collectd-4.2 collectd-4.2.4
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 21 Jan 2008 10:01:03 +0000 (11:01 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 21 Jan 2008 10:01:03 +0000 (11:01 +0100)
1  2 
src/logfile.c patch | diff1 | diff2 | blob | history

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