projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
24640dc
aee1cc1
)
Merge branch 'collectd-5.4' into collectd-5.5
author
Ruben Kerkhof
<ruben@rubenkerkhof.com>
Wed, 25 May 2016 14:53:06 +0000
(16:53 +0200)
committer
Ruben Kerkhof
<ruben@rubenkerkhof.com>
Wed, 25 May 2016 14:53:06 +0000
(16:53 +0200)
1
2
src/processes.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/processes.c
Simple merge