Merged changes from revision 314 (branches/collectd-configfile) to trunk
authorocto <octo>
Fri, 16 Dec 2005 10:32:22 +0000 (10:32 +0000)
committerocto <octo>
Fri, 16 Dec 2005 10:32:22 +0000 (10:32 +0000)
commit69a36d8615e8f6b07fc24ff4937e5f4a1c60e012
treeb45651f162e741bf5119a48b153f5f01f9cdfbf9
parent0c0448c13167b6ef097473ef3a5d4321ebae50b0
parentcc0d31d626faaedad019aa9a68bea64cbeefc7e2
Merged changes from revision 314 (branches/collectd-configfile) to trunk
src/Makefile.am
src/collectd.c