![[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) |
octo@casella:~/collectd $ svn rm branches/ntpd
| 1 | 2 | |||
|---|---|---|---|---|
| configure.in | patch | | diff1 | | diff2 | | blob | history |
| contrib/collection.cgi | patch | | diff1 | | diff2 | | blob | history |
| src/Makefile.am | patch | | diff1 | | diff2 | | blob | history |
diff --cc configure.in
Simple merge
diff --cc contrib/collection.cgi
Simple merge
diff --cc src/Makefile.am
Simple merge