CVSROOT: /cvs Module name: src Changes by: [email protected] 2010/04/15 15:14:56
Modified files:
usr.sbin/nsd : Makefile.in config.h.in configure configure.ac
nsd-notify.c nsd-zonec.8 nsd.c nsdc.8
nsdc.sh.in util.c util.h
Removed files:
usr.sbin/nsd : configlexer.c configparser.c configparser.h
zlexer.c zparser.c zparser.h
Log message:
resolve conflicts from import of v3.2.5
