projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 19e1e95 4922870)
Merge branch 'cm/lvm'
authorFlorian Forster <octo@collectd.org>
Wed, 17 Apr 2013 05:56:08 +0000 (07:56 +0200)
committerFlorian Forster <octo@collectd.org>
Wed, 17 Apr 2013 05:56:22 +0000 (07:56 +0200)
Github: #291
Signed-off-by: Florian Forster <octo@collectd.org>
1  2 
configure.in patch | diff1 | diff2 | blob | history
src/Makefile.am patch | diff1 | diff2 | blob | history

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