]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge perlinger@psp-deb1.ntp.org:ntp-stable-2650
authorJuergen Perlinger <perlinger@ntp.org>
Wed, 29 Apr 2015 18:12:23 +0000 (20:12 +0200)
committerJuergen Perlinger <perlinger@ntp.org>
Wed, 29 Apr 2015 18:12:23 +0000 (20:12 +0200)
into  hydra.(none):/home/jnperlin/Projects/Packages/NTP-DEV/src/ntp-stable-2650

bk: 55411f07IcREuk5szO3tuvZJL1sOlQ

1  2 
ntpd/ntp_config.c
ntpd/ntp_parser.h
ntpd/ntp_parser.y

Simple merge
Simple merge
Simple merge