author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
Tue, 2 Jun 2009 09:31:32 +0000 (11:31 +0200) | ||
committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
Tue, 2 Jun 2009 09:31:32 +0000 (11:31 +0200) | ||
commit | 3f0d178e58251171272a643e1667abcb9946edce | |
tree | 5e7bda21413501c8b833c20ad0f2d0bea6be0c27 | tree | snapshot |
parent | 293f51479144f9a7b34dbb835da1143ae850b159 | commit | diff |
parent | 452a77a524df028532f4d096c29b7e2a4f5102b7 | commit | diff |
Merge branch 'collectd-4.6' into collectd-4.7
Conflicts:
ChangeLog
src/collectd.conf.pod
version-gen.sh
Conflicts:
ChangeLog
src/collectd.conf.pod
version-gen.sh
ChangeLog | diff1 | | diff2 | | blob | history |
src/collectd.conf.in | diff1 | | diff2 | | blob | history |
src/collectd.conf.pod | diff1 | | diff2 | | blob | history |
src/configfile.c | diff1 | | diff2 | | blob | history |