diff options
author | mlaier <mlaier@FreeBSD.org> | 2005-05-03 16:43:32 +0000 |
---|---|---|
committer | mlaier <mlaier@FreeBSD.org> | 2005-05-03 16:43:32 +0000 |
commit | b14e72073db609ec0fb89897afe16fc5a15d3290 (patch) | |
tree | c89a2417dc919aa1ce54db59627c344530c85d79 /sys/net/if_sppp.h | |
parent | 33ac8108e208b013f6a23863636e022de6effb3a (diff) | |
download | FreeBSD-src-b14e72073db609ec0fb89897afe16fc5a15d3290.zip FreeBSD-src-b14e72073db609ec0fb89897afe16fc5a15d3290.tar.gz |
Resolve conflicts created during the import of pf 3.7 Some features are
missing and will be implemented in a second step. This is functional as is.
Tested by: freebsd-pf, pfsense.org
Obtained from: OpenBSD
X-MFC after: never (breaks API/ABI)
Diffstat (limited to 'sys/net/if_sppp.h')
0 files changed, 0 insertions, 0 deletions