drochner d5e6f1b80b resolve conflicts ... (in this case, throw away all local modifications; I'll start patching from scratch)		2003-12-04 16:23:34 +00:00
..
am-utils	Don't compare an int to NULL.	2003-10-21 02:39:44 +00:00
bind	sync w/ bind837	2003-11-26 01:35:31 +00:00
bzip2	Some e.g. cleanup: replace "eg" with "e.g.,". From Igor Sobrado in PR 19692.	2003-04-07 06:56:38 +00:00
cdk	Use bounded string op (snprintf instead of sprintf) for an automatic	2003-08-28 11:32:33 +00:00
dhcp	- Add declarations for lhs_context and rhs_context. For some reason these	2003-10-27 21:08:25 +00:00
file	<sys/cdefs.h> is a NetBSD'ism. Protect it with #ifdef __NetBSD__	2003-11-12 02:08:11 +00:00
ipf	Fix IPv6 accounting (PR#18839 by FUKAUMI Naoki).	2003-08-15 08:10:09 +00:00
nawk	bump the regular expression cache from 20 expressions to 128	2003-10-26 13:39:38 +00:00
ntp	resolve conflicts	2003-12-04 16:23:34 +00:00
pdisk	use bounded string op	2003-08-13 02:51:20 +00:00
smbfs	Spell address with two d's. Inspired by similar changes in OpenBSD,	2003-11-10 08:51:51 +00:00
tcpdump	There is no -b flag; from the description, -r is meant, so use that.	2003-10-27 08:31:23 +00:00