[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9c199c4 edec093)
Merge branch 'collectd-3.10'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 4 Nov 2006 12:56:25 +0000 (13:56 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 4 Nov 2006 12:56:25 +0000 (13:56 +0100)
1  2 
AUTHORS patch | diff1 | diff2 | blob | history
configure.in patch | diff1 | diff2 | blob | history

diff --cc AUTHORS
Simple merge
diff --cc configure.in
Simple merge
statistics collection and monitoring daemon (clone)