]> 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: 0c88d3b 51612a1)
Merge branch 'collectd-5.4'
authorMarc Fournier <marc.fournier@camptocamp.com>
Tue, 19 May 2015 20:44:27 +0000 (22:44 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Tue, 19 May 2015 20:44:27 +0000 (22:44 +0200)
1  2 
src/curl_xml.c patch | diff1 | diff2 | blob | history

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