diff options
| author | Darren Reed <darrenr@FreeBSD.org> | 2001-07-28 11:58:26 +0000 |
|---|---|---|
| committer | Darren Reed <darrenr@FreeBSD.org> | 2001-07-28 11:58:26 +0000 |
| commit | 354699e12f3e5a60ca654b9ff3fcfc421a969bfc (patch) | |
| tree | bf3386d7fdd263e4118db801dd9684a155d8d1d1 /sys/contrib/ipfilter/netinet/ipl.h | |
| parent | 5e3b2d6847bea368e1c03f4de62de7edd5067f9c (diff) | |
| download | src-354699e12f3e5a60ca654b9ff3fcfc421a969bfc.tar.gz src-354699e12f3e5a60ca654b9ff3fcfc421a969bfc.zip | |
fix conflicts created by import
Notes
Notes:
svn path=/head/; revision=80482
Diffstat (limited to 'sys/contrib/ipfilter/netinet/ipl.h')
| -rw-r--r-- | sys/contrib/ipfilter/netinet/ipl.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/contrib/ipfilter/netinet/ipl.h b/sys/contrib/ipfilter/netinet/ipl.h index 79d0bd33843b..bd03794c2c4e 100644 --- a/sys/contrib/ipfilter/netinet/ipl.h +++ b/sys/contrib/ipfilter/netinet/ipl.h @@ -1,9 +1,7 @@ /* - * Copyright (C) 1993-2000 by Darren Reed. + * Copyright (C) 1993-2001 by Darren Reed. * - * Redistribution and use in source and binary forms are permitted - * provided that this notice is preserved and due credit is given - * to the original author and the contributors. + * See the IPFILTER.LICENCE file for details on licencing. * * @(#)ipl.h 1.21 6/5/96 * $FreeBSD$ @@ -12,6 +10,6 @@ #ifndef __IPL_H__ #define __IPL_H__ -#define IPL_VERSION "IP Filter: v3.4.16" +#define IPL_VERSION "IP Filter: v3.4.20" #endif |