projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ce2d1ba e8b64d2)
Merge branch 'mlsr/uptime-aix'
authorFlorian Forster <octo@collectd.org>
Tue, 2 Oct 2012 20:04:08 +0000 (22:04 +0200)
committerFlorian Forster <octo@collectd.org>
Tue, 2 Oct 2012 20:04:08 +0000 (22:04 +0200)
1  2 
configure.in patch | diff1 | diff2 | blob | history
src/Makefile.am patch | diff1 | diff2 | blob | history

diff --cc configure.in
Simple merge
diff --cc src/Makefile.am
Simple merge
collectd, the system statistics collection daemon