projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5a7145d 65e2acb)
Merge branch 'collectd-4.6' into collectd-4.7
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 22 May 2009 15:42:56 +0000 (17:42 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 22 May 2009 15:42:56 +0000 (17:42 +0200)
1  2 
configure.in patch | diff1 | diff2 | blob | history

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