[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 855f19f 5b5f7f4)
Merge branch 'master' of git://git.verplant.org/collectd
authorFlorian Forster <octo@noris.net>
Thu, 21 Aug 2008 15:25:01 +0000 (17:25 +0200)
committerFlorian Forster <octo@noris.net>
Thu, 21 Aug 2008 15:25:01 +0000 (17:25 +0200)
1  2 
src/plugin.c patch | diff1 | diff2 | blob | history

diff --cc src/plugin.c
Simple merge
statistics collection and monitoring daemon (clone)