Module Name: src
Committed By: kardel
Date: Sun Jan 5 15:13:36 UTC 2014
Modified Files:
src/external/bsd/ntp/dist/ntpd: refclock_parse.c
src/external/bsd/ntp/include: config.h
Log Message:
- enable PARSE clocks (missed config option when merging)
- remove all conflict markers/finish merge in refclock_parse.c:1.10
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/ntp/dist/ntpd/refclock_parse.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ntp/include/config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
