[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 41288c6 604607d)
Merge remote-tracking branch 'github/pr/1967'
authorFlorian Forster <octo@collectd.org>
Fri, 11 Nov 2016 20:24:21 +0000 (21:24 +0100)
committerFlorian Forster <octo@collectd.org>
Fri, 11 Nov 2016 20:24:21 +0000 (21:24 +0100)
1  2 
configure.ac patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
statistics collection and monitoring daemon (clone)