![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@huhu.verplant.org> | |
| Thu, 13 Dec 2007 07:16:16 +0000 (08:16 +0100) | ||
| committer | Florian Forster <octo@huhu.verplant.org> | |
| Thu, 13 Dec 2007 07:16:16 +0000 (08:16 +0100) | ||
| commit | 4a5e97d6e317ee050b0a942e50159473a7d144dc | |
| tree | 4e3d4953378b3e1be21563779b3445131e7f2f8b | tree | snapshot |
| parent | 8798c7ec333eb16410161d99487ab0bee4d9adc3 | commit | diff |
| parent | 3b915093d8cbc7738b2de59f6ebc38f195131002 | commit | diff |
Merge branch 'collectd-4.2'
Conflicts:
src/utils_llist.c
Conflicts:
src/utils_llist.c
| src/collectd-perl.pod | diff1 | | diff2 | | blob | history |
| src/collectd.conf.pod | diff1 | | diff2 | | blob | history |
| src/logfile.c | diff1 | | diff2 | | blob | history |
| src/utils_avltree.c | diff1 | | diff2 | | blob | history |
| src/utils_llist.c | diff1 | | diff2 | | blob | history |