projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8fc0970 add25ce)
Merge branch 'collectd-5.5'
authorMarc Fournier <marc.fournier@camptocamp.com>
Mon, 14 Sep 2015 08:58:22 +0000 (10:58 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Mon, 14 Sep 2015 08:58:22 +0000 (10:58 +0200)
1  2 
configure.ac patch | diff1 | diff2 | blob | history

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