[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 83af568 772e602)
Merge branch 'collectd-4.10' into collectd-5.1
authorFlorian Forster <octo@collectd.org>
Mon, 14 Jan 2013 09:53:13 +0000 (10:53 +0100)
committerFlorian Forster <octo@collectd.org>
Mon, 14 Jan 2013 09:53:13 +0000 (10:53 +0100)
1  2 
src/dbi.c patch | diff1 | diff2 | blob | history

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