Darren Reed 561e006b67 resolve conflicts

2000-08-13 05:00:44 +00:00

..

amd

Remove reference to non-existent manpage (ctl-amd(8)).

2000-07-28 19:51:57 +00:00

awk

…

bc

…

bind

…

binutils

Upgrade to Binutils 2.10.0.

2000-07-06 21:33:51 +00:00

com_err

…

cpio

…

cvs

…

diff

Get rid of the stupid bug where diff sticks trash in your generated

2000-07-24 07:40:02 +00:00

gcc

…

gdb

This commit was generated by cvs2svn to compensate for changes in r64234,

2000-08-04 09:35:05 +00:00

global

…

gperf

…

groff

s/Diggest/Digest/

2000-07-28 01:54:17 +00:00

ipfilter

resolve conflicts

2000-08-13 05:00:44 +00:00

isc-dhcp

Fix conflicts.

2000-08-09 18:38:26 +00:00

less

Merge vendor changes onto mainline.

2000-07-14 09:57:37 +00:00

libf2c

…

libgmp

…

libio

…

libobjc

…

libpam

…

libpcap

This commit was generated by cvs2svn to compensate for changes in r63696,

2000-07-20 21:26:45 +00:00

libreadline

…

libstdc++

…

ncurses

Fix a merge glitch - put our FREEBSD_NATIVE hack back in the original

2000-07-03 09:38:46 +00:00

ntp

…

nvi

…

opie

Correct security hole in setproctitle(). We don't compile this code, but

2000-07-10 07:30:28 +00:00

patch

…

perl5

Find pod2man in the right place.

2000-07-10 17:42:38 +00:00

pnpinfo

…

sendmail

Add a FREEBSD-upgrade file describing what was done for the import

2000-08-12 22:25:19 +00:00

tcp_wrappers

Add IPv6 scoped address support.

2000-07-14 17:15:34 +00:00

tcpdump

…

tcsh

…

telnet

Fix buffer size of ALIGNed buffer.

2000-07-20 14:54:04 +00:00

texinfo

…

top

Correct default value for -s option.

2000-07-20 13:27:58 +00:00

traceroute

Document the -S flag (added in rev. 1.4) in the usage() function.

2000-07-07 19:44:36 +00:00