diff options
| author | guido <guido@FreeBSD.org> | 2006-08-16 12:23:02 +0000 |
|---|---|---|
| committer | guido <guido@FreeBSD.org> | 2006-08-16 12:23:02 +0000 |
| commit | e49049679f4ee5ce6bb9214122154c529a811b5e (patch) | |
| tree | 435ea094ad0e55736442383de5885c9c40c9d2a2 /contrib/ipfilter/radix.c | |
| parent | fcfb8e57499dfda26645e92a1b5ad74c6f35ee92 (diff) | |
| download | FreeBSD-src-e49049679f4ee5ce6bb9214122154c529a811b5e.zip FreeBSD-src-e49049679f4ee5ce6bb9214122154c529a811b5e.tar.gz | |
Resolve conflicts
MFC after: 1 weeks
Diffstat (limited to 'contrib/ipfilter/radix.c')
| -rw-r--r-- | contrib/ipfilter/radix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/ipfilter/radix.c b/contrib/ipfilter/radix.c index c2d3eaf..e0c69ed 100644 --- a/contrib/ipfilter/radix.c +++ b/contrib/ipfilter/radix.c @@ -139,7 +139,7 @@ struct radix_node *rn_addmask __P((int, int, void *)); * node as high in the tree as we can go. * * The present version of the code makes use of normal routes in short- - * circuiting an explict mask and compare operation when testing whether + * circuiting an explicit mask and compare operation when testing whether * a key satisfies a normal route, and also in remembering the unique leaf * that governs a subtree. */ |
