[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a46da00 1a0ffe9)
Merge branch 'collectd-5.4' into collectd-5.5
authorMarc Fournier <marc.fournier@camptocamp.com>
Mon, 14 Sep 2015 08:57:37 +0000 (10:57 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Mon, 14 Sep 2015 08:57:37 +0000 (10:57 +0200)
1  2 
configure.ac patch | diff1 | diff2 | blob | history

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