Module Name:	basesrc
Committed By:	tron
Date:		Sun Jul 16 22:10:15 UTC 2000

Modified Files:
	basesrc/usr.sbin/pppd/chat: chat.8 chat.c
	basesrc/usr.sbin/pppd/pppd: auth.c chap.c chap.h eui64.c eui64.h fsm.h
	    ipcp.c ipv6cp.c ipv6cp.h lcp.c main.c options.c patchlevel.h
	    pathnames.h pppd.8 pppd.h upap.c upap.h utils.c

Log Message:
Resolve conflicts from import.


To generate a diff of this commit:
cvs rdiff -r1.12 -r1.13 basesrc/usr.sbin/pppd/chat/chat.8
cvs rdiff -r1.18 -r1.19 basesrc/usr.sbin/pppd/chat/chat.c
cvs rdiff -r1.25 -r1.26 basesrc/usr.sbin/pppd/pppd/auth.c
cvs rdiff -r1.14 -r1.15 basesrc/usr.sbin/pppd/pppd/chap.c
cvs rdiff -r1.8 -r1.9 basesrc/usr.sbin/pppd/pppd/chap.h \
    basesrc/usr.sbin/pppd/pppd/fsm.h basesrc/usr.sbin/pppd/pppd/upap.h
cvs rdiff -r1.2 -r1.3 basesrc/usr.sbin/pppd/pppd/eui64.c \
    basesrc/usr.sbin/pppd/pppd/eui64.h basesrc/usr.sbin/pppd/pppd/ipv6cp.h
cvs rdiff -r1.18 -r1.19 basesrc/usr.sbin/pppd/pppd/ipcp.c \
    basesrc/usr.sbin/pppd/pppd/patchlevel.h
cvs rdiff -r1.7 -r1.8 basesrc/usr.sbin/pppd/pppd/ipv6cp.c
cvs rdiff -r1.20 -r1.21 basesrc/usr.sbin/pppd/pppd/lcp.c
cvs rdiff -r1.35 -r1.36 basesrc/usr.sbin/pppd/pppd/main.c
cvs rdiff -r1.31 -r1.32 basesrc/usr.sbin/pppd/pppd/options.c
cvs rdiff -r1.11 -r1.12 basesrc/usr.sbin/pppd/pppd/pathnames.h \
    basesrc/usr.sbin/pppd/pppd/upap.c
cvs rdiff -r1.27 -r1.28 basesrc/usr.sbin/pppd/pppd/pppd.8
cvs rdiff -r1.19 -r1.20 basesrc/usr.sbin/pppd/pppd/pppd.h
cvs rdiff -r1.3 -r1.4 basesrc/usr.sbin/pppd/pppd/utils.c

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