diff options
author | 2009-01-09 12:15:16 +0000 | |
---|---|---|
committer | 2009-01-09 12:15:16 +0000 | |
commit | e6841c1d1d9856acd9aadf71969ab5b1833b4658 (patch) | |
tree | cb630d0763fdc6d2813e41aafd74b22677a9b206 /lib/libcrypto/x509v3/ext_dat.h | |
parent | import openssl-0.9.8j (diff) | |
download | wireguard-openbsd-e6841c1d1d9856acd9aadf71969ab5b1833b4658.tar.xz wireguard-openbsd-e6841c1d1d9856acd9aadf71969ab5b1833b4658.zip |
resolve conflicts
Diffstat (limited to 'lib/libcrypto/x509v3/ext_dat.h')
-rw-r--r-- | lib/libcrypto/x509v3/ext_dat.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libcrypto/x509v3/ext_dat.h b/lib/libcrypto/x509v3/ext_dat.h index 5c063ac65df..3eaec46f8a6 100644 --- a/lib/libcrypto/x509v3/ext_dat.h +++ b/lib/libcrypto/x509v3/ext_dat.h @@ -1,5 +1,5 @@ /* ext_dat.h */ -/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL +/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ /* ==================================================================== |