diff options
| author |   djm <djm@openbsd.org> | 2010-10-01 22:58:41 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2010-10-01 22:58:41 +0000 |
| commit | 0a5d6eded2bd6dd9bf9d298f0d7139301afe8abe (patch) | |
| tree | 9173c770f38c55515569708729da7e02172d3f3d /lib/libssl/src/demos/easy_tls/easy-tls.h | |
| parent | import OpenSSL-1.0.0a (diff) | |
| download | wireguard-openbsd-0a5d6eded2bd6dd9bf9d298f0d7139301afe8abe.tar.xz wireguard-openbsd-0a5d6eded2bd6dd9bf9d298f0d7139301afe8abe.zip | |
resolve conflicts, fix local changes
Diffstat (limited to 'lib/libssl/src/demos/easy_tls/easy-tls.h')
| -rw-r--r-- | lib/libssl/src/demos/easy_tls/easy-tls.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libssl/src/demos/easy_tls/easy-tls.h b/lib/libssl/src/demos/easy_tls/easy-tls.h index 7ea26203c12..29af27a6e7a 100644 --- a/lib/libssl/src/demos/easy_tls/easy-tls.h +++ b/lib/libssl/src/demos/easy_tls/easy-tls.h @@ -1,7 +1,7 @@ /* -*- Mode: C; c-file-style: "bsd" -*- */ /* * easy-tls.h -- generic TLS proxy. - * $Id: easy-tls.h,v 1.3 2002/09/10 16:31:56 markus Exp $ + * $Id: easy-tls.h,v 1.4 2010/10/01 22:58:57 djm Exp $ */ /* * (c) Copyright 1999 Bodo Moeller. All rights reserved. |