mbr bc435cf924 Resolve conflicts. ...

* rev. 1.22

2003-09-02 11:10:29 +00:00

..

amd

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

2003-05-29 09:18:22 +00:00

bc

…

bind

Give an example of the more efficient conflict resolution command

2003-06-17 09:20:16 +00:00

binutils

From FSF Binutils CVS repo:

2003-05-28 03:32:33 +00:00

bzip2

…

com_err

…

cpio

If we must yell at the user than a file cannot be linked into place when

2003-07-11 02:19:19 +00:00

cvs

Add "blame" as an "annotate" alias for interoperability with subversion.

2003-07-07 19:15:36 +00:00

diff

…

expat

…

file

…

gcc

Backout rev 1.10.

2003-09-01 05:31:33 +00:00

gdb

…

gdtoa

Userland spinlocks bad. Sleep locks good.

2003-06-21 08:20:14 +00:00

gnu-sort

Merge local fixes

2003-08-30 14:19:09 +00:00

gperf

…

groff

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

2003-07-05 22:58:04 +00:00

ipfilter

…

isc-dhcp

Resolve conflicts.

2003-09-02 11:10:29 +00:00

less

…

libf2c

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

2003-08-22 02:57:17 +00:00

libobjc

Gcc 3.3.1-release Objective C support bits.

2003-08-22 02:57:15 +00:00

libpcap

…

libreadline

Merge local changes

2003-08-31 18:47:12 +00:00

libstdc++

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

2003-08-22 02:57:05 +00:00

lukemftp

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

2003-06-30 05:24:21 +00:00

lukemftpd

…

ncurses

…

ntp

…

nvi

Remove ru_SU, we don't need it in favour to ru_RU

2003-06-23 13:21:15 +00:00

one-true-awk

Update for the 2003/07/29 import.

2003-07-30 06:50:31 +00:00

openpam

MFP4: revert constification of pam_message.msg (perforce change #34785)

2003-07-21 19:54:17 +00:00

opie

FreeBSD does not use this code, but ftpd_popen() contains a buffer overflow.

2003-07-13 05:59:50 +00:00

pam_modules/pam_passwdqc

…

patch

…

pnpinfo

…

sendmail

Follow the (good) trend of returning import files to vendor versions

2003-06-18 16:43:43 +00:00

smbfs

Remove the # ("stringify") operator from the printf() arguments in

2003-08-23 13:05:13 +00:00

sort

…

tar

Fix an annoying bug in tar. When it converted 'tar zcf' to 'tar -z -c -f'

2003-07-24 00:04:01 +00:00

tcp_wrappers

…

tcpdump

…

tcsh

…

telnet

Implement what has been documented for a long time: make -debug switch

2003-08-13 10:56:40 +00:00

texinfo

Use stock (FSF) version of this file from now on.

2003-06-18 14:04:03 +00:00

top

Replace a reference to /kernel with /boot/kernel/kernel

2003-08-26 15:37:19 +00:00

traceroute

…