projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4d6ff06 63f8df3)
Merge branch 'collectd-5.4'
authorMarc Fournier <marc.fournier@camptocamp.com>
Fri, 15 Jan 2016 16:19:31 +0000 (17:19 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Fri, 15 Jan 2016 16:19:31 +0000 (17:19 +0100)
1  2 
src/processes.c patch | diff1 | diff2 | blob | history

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