![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Fri, 3 Aug 2007 08:55:03 +0000 (10:55 +0200) | ||
| committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Fri, 3 Aug 2007 08:55:03 +0000 (10:55 +0200) | ||
| commit | 785feb9d2544aff7f561fbda30aa762eec9e07bc | |
| tree | 9981a5c2485a153d8b49c0e274ee99e88da38ad6 | tree | snapshot |
| parent | 8bf455b7a37d96404ba24fe1418a925fb9aa740a | commit | diff |
| parent | 6ba08d7abcd09f2a384d5dd5582e1b2ce391cf02 | commit | diff |
Merge branch 'collectd-4.0'
Conflicts:
ChangeLog
Conflicts:
ChangeLog
| ChangeLog | diff1 | | diff2 | | blob | history |
| configure.in | diff1 | | diff2 | | blob | history |
| src/collectd.conf.in | diff1 | | diff2 | | blob | history |
| src/sensors.c | diff1 | | diff2 | | blob | history |