[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c7d2dc3 d641c34)
Merge branch 'sh/config-include'
authorFlorian Forster <octo@collectd.org>
Wed, 28 Nov 2012 09:16:26 +0000 (10:16 +0100)
committerFlorian Forster <octo@collectd.org>
Wed, 28 Nov 2012 09:16:26 +0000 (10:16 +0100)
1  2 
src/collectd.conf.pod patch | diff1 | diff2 | blob | history

diff --cc src/collectd.conf.pod
Simple merge
statistics collection and monitoring daemon (clone)