Module Name: src
Committed By: christos
Date: Sat Jan 9 16:39:29 UTC 2021
Modified Files:
src/external/bsd/ppp/dist/chat: chat.c
src/external/bsd/ppp/dist/pppd: auth.c cbcp.c ccp.c ccp.h chap-new.c
chap-new.h chap_ms.c chap_ms.h demand.c eap.c eap.h ecp.c eui64.c
eui64.h fsm.c fsm.h ipcp.c ipcp.h ipv6cp.c ipv6cp.h ipxcp.c ipxcp.h
lcp.c lcp.h magic.c magic.h main.c multilink.c options.c
patchlevel.h pathnames.h pppcrypt.c pppcrypt.h pppd.8 pppd.h
session.c tty.c upap.c upap.h utils.c
src/external/bsd/ppp/dist/pppdump: bsd-comp.c deflate.c
src/external/bsd/ppp/dist/pppstats: pppstats.c
src/external/bsd/ppp/usr.sbin/pppd: sys-bsd.c
Removed Files:
src/external/bsd/ppp/dist: .gitignore README.pppoe
src/external/bsd/ppp/dist/chat: .gitignore
src/external/bsd/ppp/dist/pppd: .gitignore
src/external/bsd/ppp/dist/pppd/plugins: passprompt.c winbind.c
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/ppp/dist/.gitignore \
src/external/bsd/ppp/dist/README.pppoe
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/ppp/dist/chat/.gitignore
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ppp/dist/chat/chat.c
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/ppp/dist/pppd/.gitignore
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ppp/dist/pppd/auth.c \
src/external/bsd/ppp/dist/pppd/cbcp.c \
src/external/bsd/ppp/dist/pppd/ccp.c src/external/bsd/ppp/dist/pppd/ccp.h \
src/external/bsd/ppp/dist/pppd/chap-new.c \
src/external/bsd/ppp/dist/pppd/chap-new.h \
src/external/bsd/ppp/dist/pppd/chap_ms.c \
src/external/bsd/ppp/dist/pppd/chap_ms.h \
src/external/bsd/ppp/dist/pppd/demand.c \
src/external/bsd/ppp/dist/pppd/eap.h src/external/bsd/ppp/dist/pppd/ecp.c \
src/external/bsd/ppp/dist/pppd/eui64.c \
src/external/bsd/ppp/dist/pppd/eui64.h \
src/external/bsd/ppp/dist/pppd/fsm.c src/external/bsd/ppp/dist/pppd/fsm.h \
src/external/bsd/ppp/dist/pppd/ipcp.c \
src/external/bsd/ppp/dist/pppd/ipcp.h \
src/external/bsd/ppp/dist/pppd/ipv6cp.c \
src/external/bsd/ppp/dist/pppd/ipv6cp.h \
src/external/bsd/ppp/dist/pppd/ipxcp.c \
src/external/bsd/ppp/dist/pppd/ipxcp.h \
src/external/bsd/ppp/dist/pppd/lcp.c src/external/bsd/ppp/dist/pppd/lcp.h \
src/external/bsd/ppp/dist/pppd/magic.c \
src/external/bsd/ppp/dist/pppd/magic.h \
src/external/bsd/ppp/dist/pppd/main.c \
src/external/bsd/ppp/dist/pppd/multilink.c \
src/external/bsd/ppp/dist/pppd/pathnames.h \
src/external/bsd/ppp/dist/pppd/pppcrypt.c \
src/external/bsd/ppp/dist/pppd/pppcrypt.h \
src/external/bsd/ppp/dist/pppd/session.c \
src/external/bsd/ppp/dist/pppd/tty.c \
src/external/bsd/ppp/dist/pppd/upap.c \
src/external/bsd/ppp/dist/pppd/upap.h \
src/external/bsd/ppp/dist/pppd/utils.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ppp/dist/pppd/eap.c \
src/external/bsd/ppp/dist/pppd/options.c \
src/external/bsd/ppp/dist/pppd/pppd.h
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ppp/dist/pppd/patchlevel.h \
src/external/bsd/ppp/dist/pppd/pppd.8
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/ppp/dist/pppd/plugins/passprompt.c \
src/external/bsd/ppp/dist/pppd/plugins/winbind.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ppp/dist/pppdump/bsd-comp.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ppp/dist/pppdump/deflate.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ppp/dist/pppstats/pppstats.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/ppp/usr.sbin/pppd/sys-bsd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
