projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9e2c04a
ed985cb
)
Merge branch 'collectd-5.6'
author
Florian Forster
<octo@collectd.org>
Tue, 6 Sep 2016 06:42:41 +0000
(08:42 +0200)
committer
Florian Forster
<octo@collectd.org>
Tue, 6 Sep 2016 06:42:41 +0000
(08:42 +0200)
1
2
src/collectd.conf.pod
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/collectd.conf.pod
Simple merge