projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7bec4af 322a563)
Merge branch 'collectd-4.6' into collectd-4.7
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 5 May 2009 18:30:10 +0000 (20:30 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 5 May 2009 18:30:10 +0000 (20:30 +0200)
1  2 
src/libcollectdclient/client.c patch | diff1 | diff2 | blob | history

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