projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
142fb2e
cf87283
)
Merge branch 'collectd-5.4' into collectd-5.5
author
Pierre-Yves Ritschard
<pyr@spootnik.org>
Fri, 6 Nov 2015 09:32:55 +0000
(10:32 +0100)
committer
Pierre-Yves Ritschard
<pyr@spootnik.org>
Fri, 6 Nov 2015 09:32:55 +0000
(10:32 +0100)
1
2
src/statsd.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/statsd.c
Simple merge