[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 514a9fe 4b962d3)
Merge branch 'collectd-5.0'
authorFlorian Forster <octo@collectd.org>
Sun, 21 Aug 2011 14:51:36 +0000 (16:51 +0200)
committerFlorian Forster <octo@collectd.org>
Sun, 21 Aug 2011 14:51:36 +0000 (16:51 +0200)
Conflicts:
configure.in
src/owniptc/libiptc.c

Change-Id: I0ab8fc1accd476f5d1a243b1a155eac4b751cd8c

1  2 
configure.in patch | diff1 | diff2 | blob | history

diff --cc configure.in
Simple merge
statistics collection and monitoring daemon (clone)