Max Laier e3ae39ac24 From OpenBSD, rev. 1.91: ...

fix servicecurve check; no point in checking the same sc three times, it
  was obviously intended to check all three. has been wrong since the
  beginning, 4 years... noticed by Earl Lapus <earl.lapus@gmail.com>, Vasil
  Dimov <vd@FreeBSD.org> mailed me then, ok mcbride

MFC after:	3 days

2006-11-30 18:55:36 +00:00

..

parse.y

Resolve conflicts created during the import of pf 3.7 Some features are

2005-05-03 16:55:20 +00:00

pf_print_state.c

Resolve conflicts created during the import of pf 3.7 Some features are

2005-05-03 16:55:20 +00:00

pfctl_altq.c

From OpenBSD, rev. 1.91:

2006-11-30 18:55:36 +00:00

pfctl_optimize.c

Resolve conflicts created during the import of pf 3.7 Some features are

2005-05-03 16:55:20 +00:00

pfctl_osfp.c

Import pf userland from OpenBSD 3.7 (OPENBSD_3_7 as of today)

2005-05-03 16:47:37 +00:00

pfctl_parser.c

Resolve conflicts created during the import of pf 3.7 Some features are

2005-05-03 16:55:20 +00:00

pfctl_parser.h

Resolve conflicts created during the import of pf 3.7 Some features are

2005-05-03 16:55:20 +00:00

pfctl_qstats.c

Resolve conflicts created during the import of pf 3.7 Some features are

2005-05-03 16:55:20 +00:00

pfctl_radix.c

Import pf userland from OpenBSD 3.7 (OPENBSD_3_7 as of today)

2005-05-03 16:47:37 +00:00

pfctl_table.c

Resolve conflicts created during the import of pf 3.7 Some features are

2005-05-03 16:55:20 +00:00

pfctl.8

- Remove MLINKS to nonexistant manpages

2005-07-14 20:29:08 +00:00

pfctl.c

Resolve conflicts created during the import of pf 3.7 Some features are

2005-05-03 16:55:20 +00:00

pfctl.h

Resolve conflicts created during the import of pf 3.7 Some features are

2005-05-03 16:55:20 +00:00