![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Sun, 14 Sep 2008 14:25:08 +0000 (16:25 +0200) | ||
| committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Sun, 14 Sep 2008 14:25:08 +0000 (16:25 +0200) | ||
| commit | 4765d9e4ae24157cc8772a30fea949b33f5a3e94 | |
| tree | 8574aaf919c438749541750ef29f270ec7441dfe | tree | snapshot |
| parent | 2f95b0626881d8ed2a2c0675a1a4767db486ef03 | commit | diff |
| parent | a791a086aaa1d90e6f6b70d34cb106ab38ae2859 | commit | diff |
Merge branch 'master' into ff/rrdcached
Conflicts:
src/rrdtool.c
Conflicts:
src/rrdtool.c
| configure.in | diff1 | | diff2 | | blob | history |
| src/Makefile.am | diff1 | | diff2 | | blob | history |
| src/collectd.conf.in | diff1 | | diff2 | | blob | history |
| src/collectd.conf.pod | diff1 | | diff2 | | blob | history |
| src/rrdtool.c | diff1 | | diff2 | | blob | history |
| src/types.db | diff1 | | diff2 | | blob | history |