octo@casella:~/collectd $ svn merge -r754:800 branches/ntpd trunk
authorocto <octo>
Sat, 10 Jun 2006 11:31:52 +0000 (11:31 +0000)
committerocto <octo>
Sat, 10 Jun 2006 11:31:52 +0000 (11:31 +0000)
octo@casella:~/collectd $ svn rm branches/ntpd

1  2 
configure.in
contrib/collection.cgi
src/Makefile.am

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