]> git.ipfire.org Git - thirdparty/collectd.git/commitdiff
projects / thirdparty / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7df2428 0b97cf2)
Merge branch 'collectd-5.4' into collectd-5.5
authorMarc Fournier <marc.fournier@camptocamp.com>
Tue, 20 Sep 2016 19:23:09 +0000 (21:23 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Tue, 20 Sep 2016 19:23:09 +0000 (21:23 +0200)
1  2 
src/daemon/common.c patch | diff1 | diff2 | blob | history

diff --cc src/daemon/common.c
Simple merge
Mirror of https://github.com/collectd/collectd.git