]> 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: ac73c75 3812f29)
Merge branch 'collectd-5.5'
authorFlorian Forster <octo@collectd.org>
Tue, 16 Jun 2015 20:46:25 +0000 (22:46 +0200)
committerFlorian Forster <octo@collectd.org>
Tue, 16 Jun 2015 20:46:25 +0000 (22:46 +0200)
1  2 
README patch | diff1 | diff2 | blob | history
configure.ac patch | diff1 | diff2 | blob | history
src/daemon/configfile.c patch | diff1 | diff2 | blob | history

diff --cc README
Simple merge
diff --cc configure.ac
Simple merge
diff --cc src/daemon/configfile.c
Simple merge
statistics collection and monitoring daemon (clone)