CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit

]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit

projects / FreeBSD / FreeBSD.git / commit

author	mlaier <mlaier@FreeBSD.org>
	Tue, 3 May 2005 16:55:20 +0000 (16:55 +0000)
committer	mlaier <mlaier@FreeBSD.org>
	Tue, 3 May 2005 16:55:20 +0000 (16:55 +0000)
commit	b28479dfe2b344764dddb58a31df37c21423cfde
tree	7a2c1661f3b801f814c99be7e4339e2b5cfdb86f	tree \| snapshot
parent	f9e60af5004dc157f222b733768010aa3d2e98d7	commit \| diff

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

18 files changed:

contrib/pf/authpf/authpf.c		diff \| blob \| history
contrib/pf/ftp-proxy/ftp-proxy.8		diff \| blob \| history
contrib/pf/ftp-proxy/ftp-proxy.c		diff \| blob \| history
contrib/pf/man/pf.4		diff \| blob \| history
contrib/pf/man/pf.conf.5		diff \| blob \| history
contrib/pf/man/pfsync.4		diff \| blob \| history
contrib/pf/pfctl/parse.y		diff \| blob \| history
contrib/pf/pfctl/pf_print_state.c		diff \| blob \| history
contrib/pf/pfctl/pfctl.c		diff \| blob \| history
contrib/pf/pfctl/pfctl.h		diff \| blob \| history
contrib/pf/pfctl/pfctl_altq.c		diff \| blob \| history
contrib/pf/pfctl/pfctl_optimize.c		diff \| blob \| history
contrib/pf/pfctl/pfctl_parser.c		diff \| blob \| history
contrib/pf/pfctl/pfctl_parser.h		diff \| blob \| history
contrib/pf/pfctl/pfctl_qstats.c		diff \| blob \| history
contrib/pf/pfctl/pfctl_table.c		diff \| blob \| history
contrib/pf/pflogd/pflogd.c		diff \| blob \| history
contrib/pf/pflogd/privsep.c		diff \| blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom