christos 27431b0ddd resolve conflicts		2008-08-30 07:34:27 +00:00
..
am-utils	Correctly elide dlog() on PCC. It's still very wrong for other non-__GNUC__	2008-08-29 00:34:04 +00:00
atf	Fix typos.	2008-05-13 12:46:14 +00:00
bind	Don't fill up /var/log/messages when the network is down; log EDNS failures	2008-08-27 05:28:42 +00:00
bzip2	Convert TNF licenses to new 2 clause variant	2008-04-30 13:10:46 +00:00
dhcp	Get rid of a spurious dereference in DHCPRELEASE.	2008-02-26 05:03:29 +00:00
file	Recognize CISO (.cso) files.	2008-08-18 22:04:47 +00:00
ipf	Not needed in NetBSD	2008-08-12 10:28:51 +00:00
iscsi	Implement the SCSI MODE_SENSE_10 command - helps quieten an error seen by	2008-04-30 20:28:30 +00:00
libarchive	Resolve conflicts.	2008-05-25 19:18:49 +00:00
libpcap	add a volatile variable to prevent vfork/longjmp clobbering.	2006-10-15 19:27:21 +00:00
nawk	As dholland pointed out, don't leak memory if FS is resized multiple	2008-08-26 20:25:19 +00:00
ntp	resolve ntp 4.2.4p5 import	2008-08-23 09:10:31 +00:00
nvi	Fix non-wide build botches.	2008-08-27 10:18:41 +00:00
openpam	Correctly use linksets with PCC too.	2008-08-29 00:35:25 +00:00
pdisk	comment out impossible code.	2006-10-24 20:45:33 +00:00
pf	merge yamt-pf42 branch.	2008-06-18 09:06:25 +00:00
pkg_install	Remove superfluous "s on .It, really this time	2008-07-09 13:02:04 +00:00
pppd	Convert TNF licenses to new 2 clause variant	2008-04-30 13:10:46 +00:00
smbfs	Remove gcc comma-eliminating variadic macro. Prefer __func__.	2008-06-27 02:09:49 +00:00
tcpdump	Convert TNF licenses to new 2 clause variant	2008-04-30 13:10:46 +00:00
wpa	resolve conflicts	2008-08-30 07:34:27 +00:00