[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5cf242b 33c0e71)
Merge branch 'collectd-5.6' into collectd-5.7
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Sun, 19 Feb 2017 11:59:13 +0000 (12:59 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Sun, 19 Feb 2017 11:59:13 +0000 (12:59 +0100)
1  2 
src/Makefile.am patch | diff1 | diff2 | blob | history

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