From: octo Date: Sat, 10 Jun 2006 11:31:52 +0000 (+0000) Subject: octo@casella:~/collectd $ svn merge -r754:800 branches/ntpd trunk X-Git-Tag: svn-trunk~12 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ae63361fe92090051cb08f2e6ad49d8dd135b3eb;p=collectd.git octo@casella:~/collectd $ svn merge -r754:800 branches/ntpd trunk octo@casella:~/collectd $ svn rm branches/ntpd --- ae63361fe92090051cb08f2e6ad49d8dd135b3eb