projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0352eb9 1e7a156)
Merge branch 'master' into collectd-4
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 31 Mar 2007 06:12:22 +0000 (08:12 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 31 Mar 2007 06:12:22 +0000 (08:12 +0200)
Conflicts:

src/iptables.c

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

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