]> git.tokkee.org Git - collectd.git/commitdiff
[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9de567a 21b429b)
Merge branch 'collectd-5.2'
authorFlorian Forster <octo@collectd.org>
Sat, 23 Mar 2013 09:13:02 +0000 (10:13 +0100)
committerFlorian Forster <octo@collectd.org>
Sat, 23 Mar 2013 09:13:02 +0000 (10:13 +0100)
Conflicts:
configure.in

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

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