Dag-Erling Smørgrav d4ecd10857 Resolve conflicts.

2005-09-03 07:04:25 +00:00

..

base64.c

…

base64.h

…

basename.c

…

bindresvport.c

…

bsd-arc4random.c

Vendor import of OpenSSH 4.0p1.

2005-06-05 15:40:50 +00:00

bsd-closefrom.c

Vendor import of OpenSSH 3.9p1.

2004-10-28 16:03:53 +00:00

bsd-cray.c

Vendor import of OpenSSH 4.0p1.

2005-06-05 15:40:50 +00:00

bsd-cray.h

Vendor import of OpenSSH 4.0p1.

2005-06-05 15:40:50 +00:00

bsd-cygwin_util.c

Vendor import of OpenSSH 4.2p1.

2005-09-03 06:59:33 +00:00

bsd-cygwin_util.h

Vendor import of OpenSSH 4.0p1.

2005-06-05 15:40:50 +00:00

bsd-getpeereid.c

…

bsd-misc.c

Vendor import of OpenSSH 4.2p1.

2005-09-03 06:59:33 +00:00

bsd-misc.h

Vendor import of OpenSSH 4.0p1.

2005-06-05 15:40:50 +00:00

bsd-nextstep.c

…

bsd-nextstep.h

…

bsd-openpty.c

Vendor import of OpenSSH 4.0p1.

2005-06-05 15:40:50 +00:00

bsd-snprintf.c

Vendor import of OpenSSH 4.0p1.

2005-06-05 15:40:50 +00:00

bsd-waitpid.c

…

bsd-waitpid.h

…

daemon.c

…

dirname.c

…

fake-queue.h

…

fake-rfc2553.c

…

fake-rfc2553.h

Resolve conflicts.

2005-09-03 07:04:25 +00:00

getcwd.c

…

getgrouplist.c

…

getopt.c

…

getrrsetbyname.c

Vendor import of OpenSSH 4.2p1.

2005-09-03 06:59:33 +00:00

getrrsetbyname.h

…

glob.c

…

glob.h

…

inet_aton.c

…

inet_ntoa.c

…

inet_ntop.c

Vendor import of OpenSSH 4.0p1.

2005-06-05 15:40:50 +00:00

Makefile.in

Vendor import of OpenSSH 4.2p1.

2005-09-03 06:59:33 +00:00

mktemp.c

Vendor import of OpenSSH 4.0p1.

2005-06-05 15:40:50 +00:00

openbsd-compat.h

Vendor import of OpenSSH 4.2p1.

2005-09-03 06:59:33 +00:00

openssl-compat.c

Vendor import of OpenSSH 4.2p1.

2005-09-03 06:59:33 +00:00

openssl-compat.h

Vendor import of OpenSSH 4.2p1.

2005-09-03 06:59:33 +00:00

port-aix.c

Vendor import of OpenSSH 4.2p1.

2005-09-03 06:59:33 +00:00

port-aix.h

Vendor import of OpenSSH 4.2p1.

2005-09-03 06:59:33 +00:00

port-irix.c

…

port-irix.h

…

port-uw.c

Vendor import of OpenSSH 4.2p1.

2005-09-03 06:59:33 +00:00

port-uw.h

Vendor import of OpenSSH 4.2p1.

2005-09-03 06:59:33 +00:00

readpassphrase.c

Vendor import of OpenSSH 4.1p1.

2005-06-05 15:41:57 +00:00

readpassphrase.h

…

realpath.c

Vendor import of OpenSSH 4.2p1.

2005-09-03 06:59:33 +00:00

rresvport.c

…

setenv.c

…

setproctitle.c

…

sigact.c

…

sigact.h

…

strlcat.c

…

strlcpy.c

…

strmode.c

…

strsep.c

…

strtoll.c

Vendor import of OpenSSH 4.2p1.

2005-09-03 06:59:33 +00:00

strtonum.c

Vendor import of OpenSSH 4.2p1.

2005-09-03 06:59:33 +00:00

strtoul.c

…

sys-queue.h

Vendor import of OpenSSH 3.9p1.

2004-10-28 16:03:53 +00:00

sys-tree.h

…

tree.h

…

vis.c

…

vis.h

…

xcrypt.c

Vendor import of OpenSSH 4.2p1.

2005-09-03 06:59:33 +00:00

xmmap.c

Vendor import of OpenSSH 4.0p1.

2005-06-05 15:40:50 +00:00