projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f709381 8cc583b)
Merge branch 'collectd-3.11' into collectd-4.0
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 15 Sep 2007 09:01:19 +0000 (11:01 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 15 Sep 2007 09:01:19 +0000 (11:01 +0200)
Conflicts:

src/apcups.c

nothing added to commit but untracked files present (use "git add" to track)


Trivial merge
collectd, the system statistics collection daemon