projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 43879fa 6213557)
Merge branch 'collectd-5.5'
authorFlorian Forster <octo@collectd.org>
Thu, 11 Jun 2015 13:39:16 +0000 (14:39 +0100)
committerFlorian Forster <octo@collectd.org>
Thu, 11 Jun 2015 13:39:16 +0000 (14:39 +0100)
1  2 
configure.ac patch | diff1 | diff2 | blob | history

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