![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@noris.net> | |
| Tue, 1 Apr 2008 13:05:45 +0000 (15:05 +0200) | ||
| committer | Florian Forster <octo@noris.net> | |
| Tue, 1 Apr 2008 13:05:45 +0000 (15:05 +0200) | ||
| commit | 4fb5d4b471e3f6a24d7cd36272e48e57bcb2c68f | |
| tree | cb938d3d5344bf65462baeffe9edd634246e27f3 | tree | snapshot |
| parent | a962cc65ed7e9fd1c26ee5f4172d3d0b82c8ec5f | commit | diff |
| parent | cc198156a5fbf657481c29329982adac3878bee4 | commit | diff |
Merge branch 'collectd-4.2' into collectd-4.3
Conflicts:
configure.in
src/plugin.c
Conflicts:
configure.in
src/plugin.c
| configure.in | diff1 | | diff2 | | blob | history |
| src/common.c | diff1 | | diff2 | | blob | history |
| src/hddtemp.c | diff1 | | diff2 | | blob | history |
| src/plugin.c | diff1 | | diff2 | | blob | history |
| src/unixsock.c | diff1 | | diff2 | | blob | history |