projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b696241 bd2d627)
Merge branch 'ka/pinba'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 1 May 2010 08:49:45 +0000 (10:49 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 1 May 2010 08:49:45 +0000 (10:49 +0200)
1  2 
configure.in patch | diff1 | diff2 | blob | history

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