projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b48fe5c 3b51243)
Merge branch 'collectd-5.2'
authorFlorian Forster <octo@collectd.org>
Sat, 16 Mar 2013 12:44:01 +0000 (13:44 +0100)
committerFlorian Forster <octo@collectd.org>
Sat, 16 Mar 2013 12:44:01 +0000 (13:44 +0100)
Conflicts:
src/plugin.c

1  2 
src/Makefile.am patch | diff1 | diff2 | blob | history

diff --cc src/Makefile.am
Simple merge
collectd, the system statistics collection daemon