projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 85f213f 939a113)
Merge branch 'collectd-4.2'
authorFlorian Forster <octo@noris.net>
Tue, 30 Oct 2007 16:19:41 +0000 (16:19 +0000)
committerFlorian Forster <octo@noris.net>
Tue, 30 Oct 2007 16:19:41 +0000 (16:19 +0000)
1  2 
src/plugin.h patch | diff1 | diff2 | blob | history

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