octo@leeloo:~/collectd $ svn merge -r786:HEAD branches/freebsd trunk
authorocto <octo>
Thu, 15 Jun 2006 21:51:52 +0000 (21:51 +0000)
committerocto <octo>
Thu, 15 Jun 2006 21:51:52 +0000 (21:51 +0000)
commit6f7f9185a4b85b442d26821b5df8742466d2e682
tree522b791fb4672df9f9822221144eaa976188fa87
parentbb18d8249033ec962eaed59651560e8f936d4a4e
parent28c5e2828cf824b0c197935518353676c9d9c344
octo@leeloo:~/collectd $ svn merge -r786:HEAD branches/freebsd trunk
configure.in
src/Makefile.am
src/memory.c