projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 538f8ff 661bf77)
Merge remote-tracking branch 'github/pr/2006'
authorFlorian Forster <octo@collectd.org>
Fri, 28 Oct 2016 05:22:59 +0000 (07:22 +0200)
committerFlorian Forster <octo@collectd.org>
Fri, 28 Oct 2016 05:22:59 +0000 (07:22 +0200)
1  2 
src/daemon/common.c patch | diff1 | diff2 | blob | history

diff --cc src/daemon/common.c
Simple merge
collectd, the system statistics collection daemon