]> git.tokkee.org Git - collectd.git/commitdiff
[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b7de71b 644ce46)
Merge branch 'collectd-5.4' into collectd-5.5
authorMarc Fournier <marc.fournier@camptocamp.com>
Fri, 6 Nov 2015 08:40:56 +0000 (09:40 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Fri, 6 Nov 2015 08:40:56 +0000 (09:40 +0100)
1  2 
src/apcups.c patch | diff1 | diff2 | blob | history

diff --cc src/apcups.c
Simple merge
statistics collection and monitoring daemon (clone)