projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f559ac3 be27c00 f2d75c7)
Merge branches 'ff/ping', 'ff/macosx-swap' and 'ff/netbsd' into collectd-3.10
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 26 Oct 2006 20:32:19 +0000 (22:32 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 26 Oct 2006 20:32:19 +0000 (22:32 +0200)

Trivial merge
collectd, the system statistics collection daemon