[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 22763cc 79f132e)
Merge branch 'collectd-4.10'
authorFlorian Forster <octo@huhu.verplant.org>
Mon, 3 May 2010 07:25:04 +0000 (09:25 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Mon, 3 May 2010 07:25:04 +0000 (09:25 +0200)
1  2 
src/Makefile.am patch | diff1 | diff2 | blob | history

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