]> 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: 3404eff 39a23c3)
Merge branch 'collectd-4.10'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 9 Jul 2010 10:05:32 +0000 (12:05 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 9 Jul 2010 10:05:32 +0000 (12:05 +0200)
1  2 
configure.in patch | diff1 | diff2 | blob | history
src/df.c patch | diff1 | diff2 | blob | history
src/swap.c patch | diff1 | diff2 | blob | history

diff --cc configure.in
Simple merge
diff --cc src/df.c
Simple merge
diff --cc src/swap.c
Simple merge
statistics collection and monitoring daemon (clone)