![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | octo <octo> | |
| Sat, 10 Jun 2006 11:31:52 +0000 (11:31 +0000) | ||
| committer | octo <octo> | |
| Sat, 10 Jun 2006 11:31:52 +0000 (11:31 +0000) | ||
| commit | ae63361fe92090051cb08f2e6ad49d8dd135b3eb | |
| tree | 366f6d565e5fa9b070bb571a9a5e7bef89f074e0 | tree | snapshot |
| parent | ef95431fe621a3edc390e5b480f00de8c25f3cef | commit | diff |
| parent | e864bcaff1a5205ab6fcdd34281544fe6a56c0fe | commit | diff |
octo@casella:~/collectd $ svn merge -r754:800 branches/ntpd trunk
octo@casella:~/collectd $ svn rm branches/ntpd
octo@casella:~/collectd $ svn rm branches/ntpd
| configure.in | diff1 | | diff2 | | blob | history |
| contrib/collection.cgi | diff1 | | diff2 | | blob | history |
| src/Makefile.am | diff1 | | diff2 | | blob | history |