[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9599b11 89fc8d1)
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 patch | diff1 | diff2 | blob | history

diff --cc src/ntpd.c
Simple merge
statistics collection and monitoring daemon (clone)