projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1b0101f a86c1a6)
Merge branch 'collectd-4.8' into collectd-4.9
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 15 Dec 2009 12:11:51 +0000 (13:11 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 15 Dec 2009 12:11:51 +0000 (13:11 +0100)
1  2 
ChangeLog patch | diff1 | diff2 | blob | history
configure.in patch | diff1 | diff2 | blob | history
src/memory.c patch | diff1 | diff2 | blob | history

diff --cc ChangeLog
Simple merge
diff --cc configure.in
Simple merge
diff --cc src/memory.c
Simple merge
collectd, the system statistics collection daemon