projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0cf5df3 02c45fc)
Merge branch 'collectd-5.4'
authorMarc Fournier <marc.fournier@camptocamp.com>
Tue, 14 Apr 2015 07:27:00 +0000 (09:27 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Tue, 14 Apr 2015 07:27:00 +0000 (09:27 +0200)
Conflicts:
src/Makefile.am
src/network.c

1  2 
version-gen.sh patch | diff1 | diff2 | blob | history

diff --cc version-gen.sh
Simple merge
collectd, the system statistics collection daemon