CVS commit: basesrc/usr.sbin/pppd

[Christos Zoulas <christos%netbsd.org@localhost>]

Module Name:    basesrc
Committed By:   christos
Date:           Wed May 29 19:06:34 UTC 2002

Modified Files:
        basesrc/usr.sbin/pppd: Makefile
        basesrc/usr.sbin/pppd/doc: PLUGINS
        basesrc/usr.sbin/pppd/pppd: auth.c cbcp.c ccp.c chap.c demand.c ipcp.c
            ipv6cp.c ipxcp.c lcp.c lcp.h main.c multilink.c options.c
            patchlevel.h pathnames.h pppd.8 pppd.h sys-bsd.c tdb.c tty.c upap.c
            utils.c
        basesrc/usr.sbin/pppd/pppdump: bsd-comp.c deflate.c pppdump.c

Log Message:
Resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.18 -r1.19 basesrc/usr.sbin/pppd/Makefile
cvs rdiff -r1.1 -r1.2 basesrc/usr.sbin/pppd/doc/PLUGINS
cvs rdiff -r1.27 -r1.28 basesrc/usr.sbin/pppd/pppd/auth.c
cvs rdiff -r1.6 -r1.7 basesrc/usr.sbin/pppd/pppd/cbcp.c \
    basesrc/usr.sbin/pppd/pppd/utils.c
cvs rdiff -r1.11 -r1.12 basesrc/usr.sbin/pppd/pppd/ccp.c \
    basesrc/usr.sbin/pppd/pppd/lcp.h
cvs rdiff -r1.16 -r1.17 basesrc/usr.sbin/pppd/pppd/chap.c
cvs rdiff -r1.10 -r1.11 basesrc/usr.sbin/pppd/pppd/demand.c
cvs rdiff -r1.20 -r1.21 basesrc/usr.sbin/pppd/pppd/ipcp.c \
    basesrc/usr.sbin/pppd/pppd/patchlevel.h
cvs rdiff -r1.9 -r1.10 basesrc/usr.sbin/pppd/pppd/ipv6cp.c
cvs rdiff -r1.8 -r1.9 basesrc/usr.sbin/pppd/pppd/ipxcp.c
cvs rdiff -r1.22 -r1.23 basesrc/usr.sbin/pppd/pppd/lcp.c
cvs rdiff -r1.38 -r1.39 basesrc/usr.sbin/pppd/pppd/main.c
cvs rdiff -r1.1 -r1.2 basesrc/usr.sbin/pppd/pppd/multilink.c \
    basesrc/usr.sbin/pppd/pppd/tty.c
cvs rdiff -r1.34 -r1.35 basesrc/usr.sbin/pppd/pppd/options.c \
    basesrc/usr.sbin/pppd/pppd/pppd.8
cvs rdiff -r1.13 -r1.14 basesrc/usr.sbin/pppd/pppd/pathnames.h \
    basesrc/usr.sbin/pppd/pppd/upap.c
cvs rdiff -r1.21 -r1.22 basesrc/usr.sbin/pppd/pppd/pppd.h
cvs rdiff -r1.36 -r1.37 basesrc/usr.sbin/pppd/pppd/sys-bsd.c
cvs rdiff -r1.2 -r1.3 basesrc/usr.sbin/pppd/pppd/tdb.c
cvs rdiff -r1.1.1.1 -r1.2 basesrc/usr.sbin/pppd/pppdump/bsd-comp.c \
    basesrc/usr.sbin/pppd/pppdump/deflate.c \
    basesrc/usr.sbin/pppd/pppdump/pppdump.c

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