projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0acab9c 444a2bc)
Merge branch 'master' into ff/dns
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 28 Oct 2006 08:16:44 +0000 (10:16 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 28 Oct 2006 08:16:44 +0000 (10:16 +0200)
1  2 
configure.in patch | diff1 | diff2 | blob | history

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