projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3469385 0c06f2f)
Merge branch 'collectd-4.2' into collectd-4.3
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 15 Apr 2008 12:04:47 +0000 (14:04 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 15 Apr 2008 12:04:47 +0000 (14:04 +0200)
1  2 
configure.in patch | diff1 | diff2 | blob | history

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