projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: acf316a 1e5c2f8)
Merge branch 'pull/collectd-4.0' into collectd-4.0
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 22 Aug 2007 14:37:29 +0000 (16:37 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 22 Aug 2007 14:37:29 +0000 (16:37 +0200)
1  2 
README patch | diff1 | diff2 | blob | history

diff --cc README
Simple merge
collectd, the system statistics collection daemon