Module Name:	src
Committed By:	christos
Date:		Thu Jun 29 21:50:17 UTC 2006

Modified Files:
	src/dist/pppd/pppd: auth.c cbcp.c ccp.c chap-new.c chap_ms.c chap_ms.h
	    demand.c ipcp.c ipv6cp.c ipxcp.c lcp.c lcp.h main.c options.c
	    patchlevel.h pathnames.h pppd.8 pppd.h tty.c upap.c
Removed Files:
	src/dist/pppd: README.sol2

Log Message:
resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.1.1.1 -r0 src/dist/pppd/README.sol2
cvs rdiff -r1.4 -r1.5 src/dist/pppd/pppd/auth.c src/dist/pppd/pppd/options.c \
    src/dist/pppd/pppd/pppd.h src/dist/pppd/pppd/tty.c
cvs rdiff -r1.2 -r1.3 src/dist/pppd/pppd/cbcp.c src/dist/pppd/pppd/ccp.c \
    src/dist/pppd/pppd/chap-new.c src/dist/pppd/pppd/chap_ms.h \
    src/dist/pppd/pppd/demand.c src/dist/pppd/pppd/ipxcp.c \
    src/dist/pppd/pppd/lcp.h src/dist/pppd/pppd/pppd.8 \
    src/dist/pppd/pppd/upap.c
cvs rdiff -r1.3 -r1.4 src/dist/pppd/pppd/chap_ms.c src/dist/pppd/pppd/ipcp.c \
    src/dist/pppd/pppd/ipv6cp.c src/dist/pppd/pppd/lcp.c \
    src/dist/pppd/pppd/pathnames.h
cvs rdiff -r1.5 -r1.6 src/dist/pppd/pppd/main.c
cvs rdiff -r1.1.1.2 -r1.2 src/dist/pppd/pppd/patchlevel.h

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