projects
/
platform
/
upstream
/
nodejs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a0a180a
d6fd118
)
Merge branch 'v0.10'
author
Fedor Indutny
<fedor@indutny.com>
Tue, 8 Apr 2014 04:55:57 +0000
(08:55 +0400)
committer
Fedor Indutny
<fedor@indutny.com>
Tue, 8 Apr 2014 04:55:57 +0000
(08:55 +0400)
Conflicts:
deps/openssl/asm/x64-elf-gas/aes/vpaes-x86_64.s
deps/openssl/asm/x64-macosx-gas/aes/vpaes-x86_64.s
deps/openssl/asm/x64-win32-masm/aes/vpaes-x86_64.asm
deps/openssl/openssl/CHANGES
deps/openssl/openssl/Makefile
deps/openssl/openssl/Makefile.org
deps/openssl/openssl/NEWS
deps/openssl/openssl/README
deps/openssl/openssl/crypto/opensslv.h
deps/openssl/openssl/openssl.spec
deps/openssl/openssl/ssl/s23_clnt.c
lib/http.js
test/simple/test-http-client-readable.js
1
2
doc/api/tls.markdown
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
doc/api/tls.markdown
Simple merge