[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 737f89c 61c79cc)
Merge remote-tracking branch 'github/pr/2054'
authorFlorian Forster <octo@collectd.org>
Fri, 25 Nov 2016 16:27:10 +0000 (17:27 +0100)
committerFlorian Forster <octo@collectd.org>
Fri, 25 Nov 2016 16:27:10 +0000 (17:27 +0100)
1  2 
src/Makefile.am patch | diff1 | diff2 | blob | history

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