Code

Merge branch 'Wshadow' into collectd-5.4
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Thu, 3 Mar 2016 20:29:16 +0000 (21:29 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Thu, 3 Mar 2016 20:29:16 +0000 (21:29 +0100)
1  2 
src/ntpd.c

diff --cc src/ntpd.c
Simple merge