![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | octo <octo> | |
| Thu, 15 Jun 2006 21:51:52 +0000 (21:51 +0000) | ||
| committer | octo <octo> | |
| Thu, 15 Jun 2006 21:51:52 +0000 (21:51 +0000) | ||
| commit | 6f7f9185a4b85b442d26821b5df8742466d2e682 | |
| tree | 522b791fb4672df9f9822221144eaa976188fa87 | tree | snapshot |
| parent | bb18d8249033ec962eaed59651560e8f936d4a4e | commit | diff |
| parent | 28c5e2828cf824b0c197935518353676c9d9c344 | commit | diff |
octo@leeloo:~/collectd $ svn merge -r786:HEAD branches/freebsd trunk
| configure.in | diff1 | | diff2 | | blob | history |
| src/Makefile.am | diff1 | | diff2 | | blob | history |
| src/memory.c | diff1 | | diff2 | | blob | history |