![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@collectd.org> | |
| Sun, 21 Aug 2011 14:51:36 +0000 (16:51 +0200) | ||
| committer | Florian Forster <octo@collectd.org> | |
| Sun, 21 Aug 2011 14:51:36 +0000 (16:51 +0200) | ||
| commit | 9b967a770f38099336c3652986d93c8b4d610a36 | |
| tree | 4997cd96162290fea8f2774b7343deba4764a4e2 | tree | snapshot |
| parent | 514a9fe8450efe2091d5671c3f7c67a8745b232e | commit | diff |
| parent | 4b962d32365228d8984759d36269904527927cf3 | commit | diff |
Merge branch 'collectd-5.0'
Conflicts:
configure.in
src/owniptc/libiptc.c
Change-Id: I0ab8fc1accd476f5d1a243b1a155eac4b751cd8c
Conflicts:
configure.in
src/owniptc/libiptc.c
Change-Id: I0ab8fc1accd476f5d1a243b1a155eac4b751cd8c
| configure.in | diff1 | | diff2 | | blob | history |