Max Laier 5357e0fedb Resolve merge conflicts ...

Approved by:	re (kensmith)
Obtained from:	tcpdump.org

2007-10-16 02:07:55 +00:00

..

os-aix4.h

…

os-hpux11.h

…

os-osf4.h

…

os-osf5.h

…

os-solaris2.h

…

os-sunos4.h

…

os-ultrix4.h

…