projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3ed2b5f 3ab61b1)
Merge branch 'st/netapp'
authorFlorian Forster <octo@noris.net>
Wed, 30 Sep 2009 16:20:32 +0000 (18:20 +0200)
committerFlorian Forster <octo@noris.net>
Wed, 30 Sep 2009 16:20:32 +0000 (18:20 +0200)
1  2 
configure.in patch | diff1 | diff2 | blob | history

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