joerg b26c8099ce Resolve conflicts.

2008-05-25 19:18:49 +00:00

..

am-utils

Add missing prototypes.

2008-05-22 14:22:28 +00:00

atf

…

bind

…

bzip2

…

dhcp

…

dhcpcd

Import dhcpcd 4.0.0-beta5.

2008-05-24 19:37:41 +00:00

file

…

ipf

Pullup IPFilter 4.1.29 from the vendor branch to HEAD.

2008-05-20 07:08:06 +00:00

iscsi

…

libarchive

Resolve conflicts.

2008-05-25 19:18:49 +00:00

libpcap

…

nawk

PR/38737: cheusov at tut dot by: Don't build the character class table

2008-05-25 16:28:25 +00:00

ntp

…

nvi

add a cast to make this file compile on amd64

2008-05-21 16:02:30 +00:00

openpam

…

pcc

…

pdisk

…

pf

…

pkg_install

…

pppd

…

smbfs

…

tcpdump

…

wpa

…