projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3e573c8 5cb5b41)
Merge branch 'collectd-4.1'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 27 Oct 2007 09:09:25 +0000 (11:09 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 27 Oct 2007 09:09:25 +0000 (11:09 +0200)
1  2 
README patch | diff1 | diff2 | blob | history
configure.in patch | diff1 | diff2 | blob | history

diff --cc README
Simple merge
diff --cc configure.in
Simple merge
collectd, the system statistics collection daemon