diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-02-19 19:32:05 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-02-19 19:32:05 +0000 |
| commit | f9b9f6c1281e238bcabeed8127a74b61f3727c55 (patch) | |
| tree | 715efa508070368f90171553f3bb24aa6ac45090 | |
| parent | 31da7f43ae6eb6935f9c6655664b42e53a834cc7 (diff) | |
Merge with EOM 1.17
author: niklas
Copyright 2000
| -rw-r--r-- | sbin/isakmpd/policy.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sbin/isakmpd/policy.c b/sbin/isakmpd/policy.c index 32cf0554abb..ab5f204fdf5 100644 --- a/sbin/isakmpd/policy.c +++ b/sbin/isakmpd/policy.c @@ -1,9 +1,9 @@ -/* $OpenBSD: policy.c,v 1.7 2000/02/11 10:21:05 niklas Exp $ */ -/* $EOM: policy.c,v 1.16 2000/02/10 11:54:07 angelos Exp $ */ +/* $OpenBSD: policy.c,v 1.8 2000/02/19 19:32:04 niklas Exp $ */ +/* $EOM: policy.c,v 1.17 2000/02/19 07:58:56 niklas Exp $ */ /* * Copyright (c) 1999, 2000 Angelos D. Keromytis. All rights reserved. - * Copyright (c) 1999 Niklas Hallqvist. All rights reserved. + * Copyright (c) 1999, 2000 Niklas Hallqvist. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions |