diff options
| author | marha <marha@users.sourceforge.net> | 2015-04-20 23:05:23 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-04-20 23:05:23 +0200 |
| commit | 0f7871ff824bcf064db3ab6bdfe26645ba6c8087 (patch) | |
| tree | 90d3d2b6112e083289c9cf68146852087814f6d3 /openssl/README | |
| parent | 934184bfecd402aae891b8740d788b486aa7269f (diff) | |
| parent | 2a00e489122f6c4b525090dbdba2855a2ea2d519 (diff) | |
| download | vcxsrv-0f7871ff824bcf064db3ab6bdfe26645ba6c8087.tar.gz vcxsrv-0f7871ff824bcf064db3ab6bdfe26645ba6c8087.tar.bz2 vcxsrv-0f7871ff824bcf064db3ab6bdfe26645ba6c8087.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
openssl/Makefile
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 7878f38e6..8ce093dd4 100644 --- a/openssl/README +++ b/openssl/README @@ -1,5 +1,5 @@ - OpenSSL 1.0.2 22 Jan 2015 + OpenSSL 1.0.2a 19 Mar 2015 Copyright (c) 1998-2011 The OpenSSL Project Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson |