projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4f92a7b fc7eb73)
Merge branch 'master' into ff/processes
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 10 Jul 2006 07:53:38 +0000 (09:53 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 10 Jul 2006 07:53:38 +0000 (09:53 +0200)
1  2 
configure.in patch | diff1 | diff2 | blob | history

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