![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Thu, 5 Jul 2007 20:16:17 +0000 (22:16 +0200) | ||
| committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Thu, 5 Jul 2007 20:16:17 +0000 (22:16 +0200) | ||
| commit | e4080f7aea79ffa3ad21fb2c8e6be311b1a404b9 | |
| tree | c0e10f5290601c150847d5b7c5e00c304e9fe16c | tree | snapshot |
| parent | c5bab65db542b276a776dc0643abcea91da60913 | commit | diff |
| parent | d4b6af75ff51019682b054b581abf85a391d13bc | commit | diff |
Merge branch 'collectd-4.0'
Conflicts:
configure.in
Conflicts:
configure.in
| configure.in | diff1 | | diff2 | | blob | history |
| src/hddtemp.c | diff1 | | diff2 | | blob | history |
| src/mbmon.c | diff1 | | diff2 | | blob | history |
| src/ntpd.c | diff1 | | diff2 | | blob | history |