projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 88f5130 44e4d53)
Merge branch 'pull/collectd-4' into collectd-4
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 17 May 2007 10:36:12 +0000 (12:36 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 17 May 2007 10:36:12 +0000 (12:36 +0200)
1  2 
configure.in patch | diff1 | diff2 | blob | history

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