[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c74b709 9aa9916)
Merge branch 'collectd-4.2' into collectd-4.3
authorFlorian Forster <octo@huhu.verplant.org>
Wed, 30 Apr 2008 06:18:21 +0000 (08:18 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Wed, 30 Apr 2008 06:18:21 +0000 (08:18 +0200)
1  2 
configure.in patch | diff1 | diff2 | blob | history

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