[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3f9b877 6d9b6a8)
Merge branch 'collectd-5.3' into collectd-5.4
authorFlorian Forster <octo@collectd.org>
Wed, 10 Sep 2014 15:15:24 +0000 (17:15 +0200)
committerFlorian Forster <octo@collectd.org>
Wed, 10 Sep 2014 15:15:24 +0000 (17:15 +0200)
1  2 
src/common.c patch | diff1 | diff2 | blob | history

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