projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7aa48cd 7fcfdb4)
Merge remote-tracking branch 'github/pr/2080'
authorFlorian Forster <octo@collectd.org>
Tue, 6 Dec 2016 13:06:05 +0000 (14:06 +0100)
committerFlorian Forster <octo@collectd.org>
Tue, 6 Dec 2016 13:06:05 +0000 (14:06 +0100)
1  2 
configure.ac patch | diff1 | diff2 | blob | history

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