[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 474d70e 673fec7)
Merge remote-tracking branch 'github/master'
authorFlorian Forster <octo@collectd.org>
Sat, 6 Aug 2016 19:15:18 +0000 (21:15 +0200)
committerFlorian Forster <octo@collectd.org>
Sat, 6 Aug 2016 19:15:18 +0000 (21:15 +0200)
1  2 
configure.ac patch | diff1 | diff2 | blob | history

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