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

diff --cc src/Makefile.am
Simple merge
collectd, the system statistics collection daemon