projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9599b11
89fc8d1
)
Merge branch 'Wshadow' into collectd-5.4
author
Ruben Kerkhof
<ruben@rubenkerkhof.com>
Thu, 3 Mar 2016 20:29:16 +0000
(21:29 +0100)
committer
Ruben Kerkhof
<ruben@rubenkerkhof.com>
Thu, 3 Mar 2016 20:29:16 +0000
(21:29 +0100)
1
2
src/ntpd.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/ntpd.c
Simple merge