freebsd-skq/contrib
Sam Leffler 316f794028 resolve conflicts
Approved by:	re (hrs)
2007-07-09 16:20:41 +00:00
..
amd Fix -D description to read debug_options 2007-05-12 10:25:31 +00:00
bc s/predefine/predefined/ 2006-01-24 06:38:35 +00:00
bind9 This commit was generated by cvs2svn to compensate for changes in r170349, 2007-06-05 22:15:38 +00:00
binutils This commit was generated by cvs2svn to compensate for changes in r168433, 2007-04-06 17:43:46 +00:00
bsnmp This commit was generated by cvs2svn to compensate for changes in r163820, 2006-10-31 09:00:35 +00:00
bzip2 Update with bzip2's URL. 2007-03-30 16:33:05 +00:00
com_err Sort sections. 2006-09-17 18:52:28 +00:00
cpio Correct insecure temporary file usage in texindex. [06:01] 2006-01-11 08:02:16 +00:00
csup Fix a typo that caused the #undef directive to not actually undefine 2007-05-19 13:55:01 +00:00
cvs Add the '-n' option which is the opposite of '-N', "Do not list tags." 2006-12-12 03:20:36 +00:00
diff This commit was generated by cvs2svn to compensate for changes in r170764, 2007-06-15 07:49:35 +00:00
expat
file Update for the 'file' 4.21 import. 2007-05-24 22:02:49 +00:00
gcc Disable shared libgcc use for profiled builds. GNU linker pulls symbols 2007-05-28 23:02:56 +00:00
gcclibs Re-add local FreeBSD change: prefer /tmp to /var/tmp and /usr/tmp 2007-05-19 03:17:00 +00:00
gdb This commit was generated by cvs2svn to compensate for changes in r169185, 2007-05-01 18:26:22 +00:00
gdtoa Merge local diffs. 2007-01-03 04:59:33 +00:00
gnu-sort
gperf
groff MFV: Sync with vendor branch. 2006-12-25 09:03:10 +00:00
hostapd resolve conflicts 2007-07-09 16:20:41 +00:00
ipfilter ipfstat should parse "any" when used with -D/-S command line options 2007-06-24 16:39:12 +00:00
less In more(1) mode, restore the historical behavior where curses init 2007-06-23 15:28:00 +00:00
libbegemot Vendor patch that adds a microsecond timer function. 2006-12-08 14:45:15 +00:00
libf2c Gcc 3.4.6 F77 runtime support bits (as of 2006/08/25 #116475). 2006-08-26 21:30:30 +00:00
libobjc This commit was generated by cvs2svn to compensate for changes in r169708, 2007-05-19 02:42:17 +00:00
libpcap Add three new ioctl(2) commands for bpf(4). 2007-02-26 22:24:14 +00:00
libreadline Merge 2007-04-12 14:45:25 +00:00
libstdc++ This commit was generated by cvs2svn to compensate for changes in r169708, 2007-05-19 02:42:17 +00:00
lukemftp
lukemftpd Pull vendor file to HEAD. 2006-08-31 17:11:46 +00:00
ncurses Add instructions for future update. 2007-01-20 08:24:05 +00:00
netcat Commit IPv6 support for FAST_IPSEC to the tree. 2007-07-01 12:08:08 +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 r162735, 2006-09-28 16:02:34 +00:00
nvi - Sort the headers per style(9) 2007-06-06 11:14:30 +00:00
one-true-awk - Update for 2007/05/01 import. 2007-06-05 15:34:40 +00:00
openbsm Regenerate config.h from OpenBSM 1.0 alpha 14 import. 2007-04-16 15:49:15 +00:00
openpam Merge from upstream: 2007-04-07 13:36:53 +00:00
opensolaris Use provider's ident to handle situations when disks are moved around 2007-05-06 01:39:39 +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 Lost these during the import. Hand me the pointy hat. 2007-07-03 14:08:49 +00:00
pnpinfo Sort sections. 2006-09-17 18:52:28 +00:00
sendmail This commit was generated by cvs2svn to compensate for changes in r168993, 2007-04-23 22:32:30 +00:00
smbfs Document default values for timeout and retry count. 2007-06-16 07:01:15 +00:00
tcp_wrappers
tcpdump o add minimal radiotap support for 11n 2007-06-11 04:04:30 +00:00
tcsh This commit was generated by cvs2svn to compensate for changes in r168305, 2007-04-03 15:51:53 +00:00
telnet Commit IPv6 support for FAST_IPSEC to the tree. 2007-07-01 12:08:08 +00:00
texinfo Add note concerning FreeBSD-SA-06:01.texindex. 2006-07-08 07:32:41 +00:00
top - s/jail id/jail ID/, acronyms should be in uppercase in general. Also, 2007-05-04 15:42:58 +00:00
traceroute Commit IPv6 support for FAST_IPSEC to the tree. 2007-07-01 12:08:08 +00:00
wpa_supplicant resolve merge conflicts 2006-03-07 05:44:45 +00:00