diff options
author | marha <marha@users.sourceforge.net> | 2014-10-19 11:34:57 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2014-10-19 11:34:57 +0200 |
commit | 8cd093f61168a373d919c68e0ce4e04949fa4eb6 (patch) | |
tree | d1bc1dd33da84a22d6ab30aa9f7efb79b592ffda /openssl/README | |
parent | 9fc852414dd4e841c4e2229f55a3e41abca64ac5 (diff) | |
parent | a14858a22f164b5accc4bd192a5d3de21d88e3d1 (diff) | |
download | vcxsrv-8cd093f61168a373d919c68e0ce4e04949fa4eb6.tar.gz vcxsrv-8cd093f61168a373d919c68e0ce4e04949fa4eb6.tar.bz2 vcxsrv-8cd093f61168a373d919c68e0ce4e04949fa4eb6.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
openssl/Makefile
openssl/crypto/opensslconf.h
Diffstat (limited to 'openssl/README')
-rw-r--r-- | openssl/README | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/openssl/README b/openssl/README index b2cf1ce1b..cb90c9f40 100644 --- a/openssl/README +++ b/openssl/README @@ -1,5 +1,5 @@ - OpenSSL 1.0.1i 6 Aug 2014 + OpenSSL 1.0.1j 15 Oct 2014 Copyright (c) 1998-2011 The OpenSSL Project Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson |