Module Name:	src
Committed By:	kardel
Date:		Wed Jun  7 20:59:28 UTC 2006

Modified Files:
	src/usr.sbin/ntp/include: config.h
	src/usr.sbin/ntp/libisc: Makefile
	src/usr.sbin/ntp/libntp: Makefile
	src/usr.sbin/ntp/libparse: Makefile
	src/usr.sbin/ntp/ntpd: Makefile
	src/usr.sbin/ntp/ntptime: Makefile

Log Message:
merge timecounter branch


To generate a diff of this commit:
cvs rdiff -r1.10 -r1.11 src/usr.sbin/ntp/include/config.h
cvs rdiff -r1.2 -r1.3 src/usr.sbin/ntp/libisc/Makefile
cvs rdiff -r1.6 -r1.7 src/usr.sbin/ntp/libntp/Makefile
cvs rdiff -r1.4 -r1.5 src/usr.sbin/ntp/libparse/Makefile
cvs rdiff -r1.11 -r1.12 src/usr.sbin/ntp/ntpd/Makefile
cvs rdiff -r1.6 -r1.7 src/usr.sbin/ntp/ntptime/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.