freebsd-dev/contrib
Sam Leffler 17cb103cb1 resolve merge conflicts
MFC after:	1 month
2006-09-04 20:25:04 +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 Fix ipfw packet matching errors with address tables. 2005-06-29 21:36:49 +00:00
com_err Markup fixes. 2005-06-16 20:51:10 +00:00
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 Correct insecure temporary file usage. 2005-09-07 13:39:44 +00:00
diff Make diff(1) follow traditional UNIX SOP of later options nullify earlier 2005-06-03 06:46:56 +00:00
expat
file This commit was generated by cvs2svn to compensate for changes in r159825, 2006-06-21 09:28:00 +00:00
gcc Resolve conflicts after GCC 3.4.6 20060825 import. 2006-08-26 21:37:21 +00:00
gdb This commit was generated by cvs2svn to compensate for changes in r161561, 2006-08-24 02:43:20 +00:00
gdtoa Configure gdtoa so that floating-point numbers are correctly rounded 2005-01-18 18:56:18 +00:00
gnu-sort Correct va_end usage. 2004-08-27 03:52:29 +00:00
gperf Remove unneded files 2004-02-17 01:51:07 +00:00
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 Resolve conflicts. 2006-08-20 15:50:51 +00:00
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 This commit was generated by cvs2svn to compensate for changes in r161657, 2006-08-26 21:30:30 +00:00
libobjc Gcc 3.4.6 Objective C support bits (as of 2006/08/25 #116475). 2006-08-26 21:30:26 +00:00
libpcap sigh, put back buffer overflow fix of 1.1.11 that seems to have 2006-09-04 20:12:45 +00:00
libreadline Merge conflicts after official patches 2006-03-27 23:53:05 +00:00
libstdc++ This commit was generated by cvs2svn to compensate for changes in r161653, 2006-08-26 21:29:46 +00:00
lukemftp This commit was generated by cvs2svn to compensate for changes in r146309, 2005-05-17 03:11:29 +00:00
lukemftpd Pull vendor file to HEAD. 2006-08-31 17:11:46 +00:00
ncurses Switch to contemporary TTY interface. 2005-07-15 07:41:26 +00:00
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 This commit was generated by cvs2svn to compensate for changes in r138451, 2004-12-06 14:33:29 +00:00
nvi Remove the dates from these files. They serve no purpose and result in 2005-08-17 15:56:04 +00:00
one-true-awk Update for the 2005/04/24 import. 2005-05-16 19:19:32 +00:00
openbsm Note removal of certain contrib/openbsm/bsm include files from 2006-09-02 09:56:28 +00:00
openpam Fix markup errors caused by a bug in gendoc.pl (see P4 change #78671) 2005-06-17 14:39:09 +00:00
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 Remove alpha left-overs. 2006-08-22 08:03:01 +00:00
sendmail Update to sendmail 8.13.8 2006-08-17 05:16:15 +00:00
smbfs Spell 'connection options' correctly. 2006-08-11 12:35:22 +00:00
tar Add */lib/getopt* I miss somehow initially. 2004-02-18 18:53:13 +00:00
tcp_wrappers NI_WITHSCOPEID cleanup. Neither RFC 2553 nor RFC 3493 defines 2005-05-13 16:31:11 +00:00
tcpdump resolve merge conflicts 2006-09-04 20:25:04 +00:00
tcsh Remove the nls/*/charset files to the exclude list. These files 2006-03-16 04:01:27 +00:00
telnet NI_WITHSCOPEID cleanup 2005-05-21 15:28:42 +00:00
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