Code

Merge branch 'collectd-4.1'
authorFlorian Forster <octo@huhu.verplant.org>
Fri, 26 Oct 2007 08:08:28 +0000 (10:08 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Fri, 26 Oct 2007 08:08:28 +0000 (10:08 +0200)
1  2 
configure.in
src/rrdtool.c
src/types.db

diff --cc configure.in
Simple merge
diff --cc src/rrdtool.c
Simple merge
diff --cc src/types.db
Simple merge