projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 41f1416 bcb2418)
Merge branch 'collectd-4.3' into collectd-4.4
authorFlorian Forster <octo@noris.net>
Mon, 14 Jul 2008 07:44:29 +0000 (09:44 +0200)
committerFlorian Forster <octo@noris.net>
Mon, 14 Jul 2008 07:44:29 +0000 (09:44 +0200)
Conflicts:

src/ntpd.c

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

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