projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 91743fc e21d040)
Merge branch 'collectd-4.8'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 17 Sep 2009 06:53:05 +0000 (08:53 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 17 Sep 2009 06:53:05 +0000 (08:53 +0200)
1  2 
configure.in patch | diff1 | diff2 | blob | history
src/Makefile.am patch | diff1 | diff2 | blob | history

diff --cc configure.in
Simple merge
diff --cc src/Makefile.am
Simple merge
collectd, the system statistics collection daemon