projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 79d36d9 d51a376)
Merge branch 'collectd-3.11' into merge/collectd-4
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 11 Feb 2007 14:39:58 +0000 (15:39 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 11 Feb 2007 14:39:58 +0000 (15:39 +0100)
Conflicts:

src/multimeter.c
src/plugin.c

1  2 
configure.in patch | diff1 | diff2 | blob | history

diff --cc configure.in
Simple merge
collectd, the system statistics collection daemon