projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e7bbae6 0c00468)
Merge branch 'collectd-5.5'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Sun, 6 Dec 2015 15:43:11 +0000 (16:43 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Sun, 6 Dec 2015 15:43:11 +0000 (16:43 +0100)
1  2 
configure.ac patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
collectd, the system statistics collection daemon