]> git.ipfire.org Git - thirdparty/collectd.git/commitdiff
Merge branch 'collectd-4.10' into collectd-5.0
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 7 Feb 2011 07:47:35 +0000 (08:47 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 7 Feb 2011 07:47:35 +0000 (08:47 +0100)
1  2 
src/exec.c
src/threshold.c

diff --cc src/exec.c
Simple merge
diff --cc src/threshold.c
Simple merge