![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Mon, 15 Mar 2010 21:40:45 +0000 (22:40 +0100) | ||
| committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Mon, 15 Mar 2010 21:40:45 +0000 (22:40 +0100) | ||
| commit | 9988d61c84dfff5d04ddf48f4b93f6c9449cdc41 | |
| tree | baec76cd90c857d1beea4dc45c6e712c0663127c | tree | snapshot |
| parent | 3bd6fcdfd20002eee1f1803460728449c0c98f86 | commit | diff |
| parent | 40783e8982dd86f65dcf67df44992097719a995b | commit | diff |
Merge branch 'collectd-4.8' into collectd-4.9
Conflicts:
src/exec.c
Conflicts:
src/exec.c
| configure.in | diff1 | | diff2 | | blob | history |
| src/common.c | diff1 | | diff2 | | blob | history |
| src/common.h | diff1 | | diff2 | | blob | history |
| src/configfile.c | diff1 | | diff2 | | blob | history |
| src/exec.c | diff1 | | diff2 | | blob | history |
| src/processes.c | diff1 | | diff2 | | blob | history |