projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1906651 5c4d218)
Merge branch 'master' into ja/lua
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 26 Nov 2010 21:50:45 +0000 (22:50 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 26 Nov 2010 21:50:45 +0000 (22:50 +0100)
1  2 
configure.in patch | diff1 | diff2 | blob | history

diff --cc configure.in
Simple merge
collectd, the system statistics collection daemon