projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0a62e9b 0f0de64)
Merge remote-tracking branch 'github/pr/1437'
authorFlorian Forster <octo@collectd.org>
Tue, 8 Dec 2015 09:44:13 +0000 (10:44 +0100)
committerFlorian Forster <octo@collectd.org>
Tue, 8 Dec 2015 09:44:13 +0000 (10:44 +0100)
1  2 
configure.ac patch | diff1 | diff2 | blob | history

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