1
0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-21 11:13:30 +00:00
freebsd/contrib
Guido van Rooij dac098f2c9 Resolve conflicts
MFC after:	1 weeks
2006-08-16 12:23:02 +00:00
..
amd Correct a typo: In order to make fixmount(8) quite, one should 2006-04-18 03:33:17 +00:00
bc s/predefine/predefined/ 2006-01-24 06:38:35 +00:00
bind9 Reimplementation of world/kernel build options. For details, see: 2006-03-17 18:54:44 +00:00
binutils This commit was generated by cvs2svn to compensate for changes in r159399, 2006-06-08 13:10:51 +00:00
bsnmp This commit was generated by cvs2svn to compensate for changes in r159063, 2006-05-30 07:46:52 +00:00
bzip2
com_err
cpio Correct insecure temporary file usage in texindex. [06:01] 2006-01-11 08:02:16 +00:00
csup Import the latest snapshot of csup (20060313). 2006-03-14 03:51:13 +00:00
cvs
diff
expat
file This commit was generated by cvs2svn to compensate for changes in r159825, 2006-06-21 09:28:00 +00:00
gcc
gdb
gdtoa
gnu-sort
gperf
groff Pull up from the FSF branch. 2006-01-12 15:31:41 +00:00
hostapd This commit was generated by cvs2svn to compensate for changes in r157181, 2006-03-27 18:15:24 +00:00
ipfilter Resolve conflicts 2006-08-16 12:23:02 +00:00
less
libbegemot This is actually a section 3 man page, not section 1. Also fix a couple 2006-03-17 10:04:10 +00:00
libf2c
libobjc
libpcap This commit was generated by cvs2svn to compensate for changes in r154439, 2006-01-16 20:33:23 +00:00
libreadline Merge conflicts after official patches 2006-03-27 23:53:05 +00:00
libstdc++
lukemftp
lukemftpd
ncurses
netcat Resolve conflicts. 2006-05-21 15:52:24 +00:00
ngatm This commit was generated by cvs2svn to compensate for changes in r156678, 2006-03-13 09:37:22 +00:00
ntp
nvi
one-true-awk
openbsm Resolve conflicts from OpenBSM 1.0 alpha 7 import. 2006-06-27 18:09:54 +00:00
openpam
opie Add missing code needed for the detection of IPSec packet replays. [1] 2006-03-22 16:00:42 +00:00
pam_modules/pam_passwdqc
pf - Note that the synchronisation interface needs to be up and have 2006-06-06 12:35:53 +00:00
pnpinfo
sendmail Update FreeBSD info regarding sendmail 8.13.7 import 2006-06-14 16:33:59 +00:00
smbfs Spell 'connection options' correctly. 2006-08-11 12:35:22 +00:00
tar
tcp_wrappers
tcpdump Document that 'bad cksum 0' is expected on NICs with checksum off-loading. 2006-06-20 05:04:05 +00:00
tcsh Remove the nls/*/charset files to the exclude list. These files 2006-03-16 04:01:27 +00:00
telnet
texinfo Add note concerning FreeBSD-SA-06:01.texindex. 2006-07-08 07:32:41 +00:00
top Update the description of the `STATE' column for SMP systems, 2006-05-16 15:27:43 +00:00
traceroute Make traceroute decode all the ICMP unreachable messages defined 2006-06-13 14:59:07 +00:00
wpa_supplicant resolve merge conflicts 2006-03-07 05:44:45 +00:00