[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f9a6df0 00f7d2c)
Merge remote-tracking branch 'collectd/collectd-5.4' into collectd-5.5
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Sun, 6 Dec 2015 15:40:36 +0000 (16:40 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Sun, 6 Dec 2015 15:40:36 +0000 (16:40 +0100)
1  2 
configure.ac patch | diff1 | diff2 | blob | history

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