projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eca9697 4c7e568)
Merge branch 'collectd-4.6' into collectd-4.7
authorFlorian Forster <sifnfors@informatik.stud.uni-erlangen.de>
Mon, 6 Jul 2009 11:45:32 +0000 (13:45 +0200)
committerFlorian Forster <sifnfors@informatik.stud.uni-erlangen.de>
Mon, 6 Jul 2009 11:45:32 +0000 (13:45 +0200)
1  2 
src/common.c patch | diff1 | diff2 | blob | history

diff --cc src/common.c
Simple merge
collectd, the system statistics collection daemon