Code

Merge branch 'collectd-4.2' into collectd-4.3
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 28 Feb 2008 22:06:16 +0000 (23:06 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 28 Feb 2008 22:06:16 +0000 (23:06 +0100)
1  2 
configure.in
src/common.c
src/common.h
src/network.c

diff --cc configure.in
Simple merge
diff --cc src/common.c
Simple merge
diff --cc src/common.h
Simple merge
diff --cc src/network.c
Simple merge