obrien e71f7e5411 Fix conflicts.

2000-07-20 08:44:53 +00:00

..

amd

Mention "amd -H" in the synopsis so that references to the "first form

2000-07-12 20:32:43 +00:00

awk

…

bc

…

bind

Resolve conflicts.

2000-05-26 07:24:14 +00:00

binutils

Upgrade to Binutils 2.10.0.

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

com_err

…

cpio

…

cvs

…

diff

…

gcc

Fix conflicts.

2000-05-27 02:43:50 +00:00

gdb

These files were part of GDB 4.16, but not version 4.18 (that we

2000-05-17 19:32:59 +00:00

global

…

gperf

Zap old files no longer included in gperf 2.7

2000-03-25 08:25:58 +00:00

groff

Remove stale file - moved to new location

2000-05-07 13:34:40 +00:00

ipfilter

actually commit merged diffs to the trunk

2000-07-19 23:10:29 +00:00

isc-dhcp

Fix conflicts.

2000-07-20 08:44:53 +00:00

less

Merge vendor changes onto mainline.

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

libf2c

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

2000-06-04 08:30:31 +00:00

libgmp

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

2000-04-17 18:45:32 +00:00

libio

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

2000-06-04 08:21:31 +00:00

libobjc

Bring in bug fixes from the GCC anoncvs server's "gcc-2_95-branch"

2000-03-30 03:23:37 +00:00

libpam

…

libpcap

Fix make world breakage.

2000-07-19 16:03:34 +00:00

libreadline

Merge conflicts

2000-03-19 22:00:57 +00:00

libstdc++

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

2000-06-04 08:30:31 +00:00

ncurses

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

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

ntp

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

2000-03-03 17:06:31 +00:00

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

…

tcp_wrappers

Add IPv6 scoped address support.

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

tcpdump

Include ip6.h from <netinet/>, not <netinet6/>.

2000-03-08 02:24:10 +00:00

tcsh

Offical fixes to allow longer lines in the history and tweak expand_lex()

2000-06-10 22:20:53 +00:00

telnet

Add missing $FreeBSD$ to files that are NOT still on vendor a branch.

2000-07-16 05:48:49 +00:00

texinfo

…

top

…

traceroute

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

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