Code

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)
1  2 
configure.in
src/Makefile.am
src/memory.c

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