diff options
author | Trevor Norris <trev.norris@gmail.com> | 2014-12-15 19:57:28 -0800 |
---|---|---|
committer | Trevor Norris <trev.norris@gmail.com> | 2014-12-19 16:31:12 -0800 |
commit | ae6444dad925a18a66ee0b1db3936534dbf822f4 (patch) | |
tree | 8b2fbd96eb6899ebf1f52a0c8c1e3e7a801a2a56 /deps/openssl/openssl/openssl.spec | |
parent | 4bba87050c2b8aa801d982e93ea767b3abdc2f17 (diff) | |
parent | 813114dab05231b71f3cdc4f5889b9833d9a1d06 (diff) | |
download | node-ae6444dad925a18a66ee0b1db3936534dbf822f4.tar.gz |
Merge branch 'v0.10' into merge-review2merge-review2
Reverted caeb6773 for being unable to port the change to deps/v8. The
change will be ported directly in a later commit.
Conflicts:
ChangeLog
configure
doc/api/child_process.markdown
doc/api/tls.markdown
doc/api/url.markdown
lib/assert.js
lib/child_process.js
lib/crypto.js
lib/dgram.js
lib/http.js
lib/net.js
lib/timers.js
lib/tls.js
src/node.cc
src/node.h
src/node.js
src/node_crypto.cc
src/node_version.h
test/common.js
test/simple/test-child-process-spawn-typeerror.js
tools/certdata.txt
Diffstat (limited to 'deps/openssl/openssl/openssl.spec')
-rw-r--r-- | deps/openssl/openssl/openssl.spec | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/deps/openssl/openssl/openssl.spec b/deps/openssl/openssl/openssl.spec index a7e277650..706fb5d23 100644 --- a/deps/openssl/openssl/openssl.spec +++ b/deps/openssl/openssl/openssl.spec @@ -7,7 +7,7 @@ Release: 1 Summary: Secure Sockets Layer and cryptography libraries and tools Name: openssl #Version: %{libmaj}.%{libmin}.%{librel} -Version: 1.0.1i +Version: 1.0.1j Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz License: OpenSSL Group: System Environment/Libraries |