Code

Merge branch 'collectd-4.7'
authorFlorian Forster <octo@huhu.verplant.org>
Wed, 20 May 2009 09:02:17 +0000 (11:02 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Wed, 20 May 2009 09:02:17 +0000 (11:02 +0200)
1  2 
configure.in
src/Makefile.am

diff --cc configure.in
Simple merge
diff --cc src/Makefile.am
Simple merge