projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
662b302
22651d8
)
Merge branch 'collectd-5.5'
author
Ruben Kerkhof
<ruben@rubenkerkhof.com>
Fri, 3 Jun 2016 10:56:53 +0000
(12:56 +0200)
committer
Ruben Kerkhof
<ruben@rubenkerkhof.com>
Fri, 3 Jun 2016 10:56:53 +0000
(12:56 +0200)
Conflicts:
src/perl.c
1
2
src/perl.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/perl.c
Simple merge