projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e21d040 bc7c4ca)
Merge branch 'collectd-4.7' into collectd-4.8
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 17 Sep 2009 07:40:28 +0000 (09:40 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 17 Sep 2009 07:40:28 +0000 (09:40 +0200)
1  2 
README patch | diff1 | diff2 | blob | history
configure.in patch | diff1 | diff2 | blob | history

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