projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 78a4967 f0d4bdc)
Merge branch 'collectd-4.5' into collectd-4.6
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 14 Mar 2009 17:52:19 +0000 (18:52 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 14 Mar 2009 17:52:19 +0000 (18:52 +0100)
1  2 
src/common.c patch | diff1 | diff2 | blob | history
src/memory.c patch | diff1 | diff2 | blob | history

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