[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: da62514 d595245 5acef0c b102fa8)
Merge remote-tracking branches 'github/pr/1857', 'github/pr/1859' and 'github/pr...
authorFlorian Forster <octo@collectd.org>
Sat, 6 Aug 2016 19:13:22 +0000 (21:13 +0200)
committerFlorian Forster <octo@collectd.org>
Sat, 6 Aug 2016 19:13:22 +0000 (21:13 +0200)
1  2  3  4 
configure.ac patch | diff1 | diff2 | diff3 | diff4 | blob | history

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