christos c2c52ef2eb Resolve conflicts.		2005-02-26 20:58:24 +00:00
..
am-utils	Work around the fact opaque_t gets defined by sys/properties.h and could be	2004-11-28 11:15:26 +00:00
bind	Remove inline from rotate_{left,right}. Breaks compilation with gcc-3.3	2005-02-22 18:42:15 +00:00
bzip2	save another 4K, by not having a large text message and a segv handler	2004-06-06 06:39:27 +00:00
cdk	Use (unsigned char) not & 0xff on args to ctype functions	2004-10-28 20:52:20 +00:00
dhcp	use /dev/bpf	2004-12-01 23:45:12 +00:00
file	Make building a bit more automatic by borrowing the rest of the	2005-02-21 15:25:57 +00:00
ipf	Reinstate the ntohs() on port numbers returned bu getport()	2005-02-20 21:44:51 +00:00
nawk	allow to escape newline in string literals.	2005-01-13 12:10:02 +00:00
ntp	include <isc/net.h> so that -UWANT_IPV6 compiles correctly.	2005-01-10 02:14:46 +00:00
openpam	Resolve conflicts.	2005-02-26 20:58:24 +00:00
pdisk	deal with editing partitions past the detected media size.	2004-06-14 07:48:55 +00:00
pf	Add MKIPFILTER; if set to no, don't build and install the ipf(4) programs,	2005-02-22 14:39:58 +00:00
pppd	We don't want README.sol2 next time.	2005-02-20 10:51:52 +00:00
smbfs	Add (unsigned char) cast to ctype function	2004-10-29 19:15:20 +00:00
tcpdump	fix configure too.	2004-12-01 23:26:13 +00:00