Code

Merge branch 'collectd-4.5' into collectd-4.6
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 9 May 2009 10:29:44 +0000 (12:29 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 9 May 2009 10:29:44 +0000 (12:29 +0200)
1  2 
configure.in
src/collectd.h
src/swap.c

diff --cc configure.in
Simple merge
diff --cc src/collectd.h
Simple merge
diff --cc src/swap.c
Simple merge