projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e9ef1a2
82e2767
)
Merge branch 'collectd-5.3' into collectd-5.4
author
Marc Fournier
<marc.fournier@camptocamp.com>
Tue, 14 Apr 2015 07:25:02 +0000
(09:25 +0200)
committer
Marc Fournier
<marc.fournier@camptocamp.com>
Tue, 14 Apr 2015 07:25:02 +0000
(09:25 +0200)
1
2
src/Makefile.am
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/Makefile.am
Simple merge