projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4c66592 904ce56)
Merge branch 'ff/plugins-ng' of octo@verplant.org:/var/lib/git/collectd into ff/plugi...
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 15 Jan 2007 17:30:36 +0000 (18:30 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 15 Jan 2007 17:30:36 +0000 (18:30 +0100)
1  2 
src/network.c patch | diff1 | diff2 | blob | history

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