From 9734662102d38c4dd9171643aa6bea9e508f3e76 Mon Sep 17 00:00:00 2001
From: Niklas Hallqvist <niklas@cvs.openbsd.org>
Date: Fri, 7 Apr 2000 22:10:31 +0000
Subject: conf.c: Merge with EOM 1.22 gmp_util.c: Merge with EOM 1.5
 gmp_util.h: Merge with EOM 1.3 math_mp.h: Merge with EOM 1.2 sa.c: Merge with
 EOM 1.101 ui.c: Merge with EOM 1.40

author: niklas
(c) 2000
---
 sbin/isakmpd/sa.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'sbin/isakmpd/sa.c')

diff --git a/sbin/isakmpd/sa.c b/sbin/isakmpd/sa.c
index 4c314e8211b..62ddfbf0728 100644
--- a/sbin/isakmpd/sa.c
+++ b/sbin/isakmpd/sa.c
@@ -1,8 +1,8 @@
-/*	$OpenBSD: sa.c,v 1.26 2000/04/07 22:06:44 niklas Exp $	*/
-/*	$EOM: sa.c,v 1.100 2000/04/07 19:05:01 niklas Exp $	*/
+/*	$OpenBSD: sa.c,v 1.27 2000/04/07 22:10:30 niklas Exp $	*/
+/*	$EOM: sa.c,v 1.101 2000/04/07 22:05:57 niklas Exp $	*/
 
 /*
- * Copyright (c) 1998, 1999 Niklas Hallqvist.  All rights reserved.
+ * Copyright (c) 1998, 1999, 2000 Niklas Hallqvist.  All rights reserved.
  * Copyright (c) 1999 Angelos D. Keromytis.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
-- 
cgit v1.2.3