Date: Mon, 10 Apr 2000 04:18:55 -0700 (PDT) From: Kris Kennaway <kris@FreeBSD.org> To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/contrib/opie ftpcmd.y opie.4 opie.h opie_cfg.h opieftpd.c opieinfo.1 opiekey.1 opiekeys.5 opiepasswd.1 src/contrib/opie/libopie generator.c hash.c hashlen.c newseed.c Message-ID: <200004101118.EAA53865@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
kris 2000/04/10 04:18:55 PDT
Modified files:
contrib/opie ftpcmd.y opie.4 opie.h opie_cfg.h
opieftpd.c opieinfo.1 opiekey.1
opiekeys.5 opiepasswd.1
contrib/opie/libopie generator.c hash.c hashlen.c newseed.c
Log:
Resolve conflicts
Revision Changes Path
1.3 +3 -1 src/contrib/opie/ftpcmd.y
1.7 +2 -2 src/contrib/opie/opie.4
1.5 +10 -1 src/contrib/opie/opie.h
1.4 +8 -4 src/contrib/opie/opie_cfg.h
1.3 +5 -2 src/contrib/opie/opieftpd.c
1.4 +2 -1 src/contrib/opie/opieinfo.1
1.4 +2 -1 src/contrib/opie/opiekey.1
1.4 +4 -1 src/contrib/opie/opiekeys.5
1.4 +2 -1 src/contrib/opie/opiepasswd.1
1.4 +25 -9 src/contrib/opie/libopie/generator.c
1.4 +3 -1 src/contrib/opie/libopie/hash.c
1.4 +3 -1 src/contrib/opie/libopie/hashlen.c
1.3 +10 -4 src/contrib/opie/libopie/newseed.c
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200004101118.EAA53865>