[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e1e33fa b0608a2)
Merge branch 'collectd-4.5' into collectd-4.6
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 28 Feb 2009 09:35:04 +0000 (10:35 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 28 Feb 2009 09:35:04 +0000 (10:35 +0100)
1  2 
src/common.c patch | diff1 | diff2 | blob | history
src/dns.c patch | diff1 | diff2 | blob | history

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