[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8df7333 0632ace)
Merge branch 'collectd-4.10' into collectd-5.3
authorMarc Fournier <marc.fournier@camptocamp.com>
Tue, 14 Apr 2015 07:17:27 +0000 (09:17 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Tue, 14 Apr 2015 07:17:27 +0000 (09:17 +0200)
1  2 
src/Makefile.am patch | diff1 | diff2 | blob | history

diff --cc src/Makefile.am
Simple merge
statistics collection and monitoring daemon (clone)