projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 66e0fe8 fe69cd3)
Merge branch 'collectd-4.3' into collectd-4.4
authorFlorian Forster <octo@huhu.verplant.org>
Thu, 21 Aug 2008 15:24:32 +0000 (17:24 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Thu, 21 Aug 2008 15:24:32 +0000 (17:24 +0200)
1  2 
src/collectd-exec.pod patch | diff1 | diff2 | blob | history
src/plugin.c patch | diff1 | diff2 | blob | history

diff --cc src/collectd-exec.pod
Simple merge
diff --cc src/plugin.c
Simple merge
collectd, the system statistics collection daemon