![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Fri, 28 Dec 2007 18:04:45 +0000 (19:04 +0100) | ||
| committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Fri, 28 Dec 2007 18:04:45 +0000 (19:04 +0100) | ||
| commit | e8993811715b8d505a176e1f34985ac2b63791a2 | |
| tree | f51d3c8b37f96f8d1888e4095645bc8cfbd34f55 | tree | snapshot |
| parent | c41e4859301c69b1489abcd9e2e7c7959d5ddf50 | commit | diff |
| parent | ce6906b4b8a38a98f2ba6eb2af7b8eadf0a9be02 | commit | diff |
Merge branch 'collectd-4.2'
Conflicts:
bindings/Makefile.am
Conflicts:
bindings/Makefile.am
| bindings/Makefile.am | diff1 | | diff2 | | blob | history |
| src/Makefile.am | diff1 | | diff2 | | blob | history |
| src/network.c | diff1 | | diff2 | | blob | history |
| src/utils_avltree.c | diff1 | | diff2 | | blob | history |
| src/utils_avltree.h | diff1 | | diff2 | | blob | history |