CVSROOT:        /cvs
Module name:    src
Changes by:     [email protected]   2012/03/02 01:40:58

Modified files:
        usr.sbin/nsd   : configure configure.ac nsd-checkconf.8.in 
                         nsd-notify.8.in nsd-patch.8.in nsd-xfer.8.in 
                         nsd.8.in nsd.c nsd.conf.5.in nsdc.8.in nsec3.c 
                         region-allocator.c zonec.8.in 

Log message:
resolve conflicts

Reply via email to