Timothy J Fontaine 2329a254b4 Merge remote-tracking branch 'upstream/v0.10' ...

Conflicts:
	AUTHORS
	ChangeLog
	deps/uv/AUTHORS
	deps/uv/ChangeLog
	deps/uv/README.md
	deps/uv/build.mk
	deps/uv/src/unix/core.c
	deps/uv/src/unix/darwin-proctitle.c
	deps/uv/src/unix/darwin.c
	deps/uv/src/unix/fsevents.c
	deps/uv/src/unix/udp.c
	deps/uv/src/version.c
	deps/v8/src/platform-solaris.cc
	deps/v8/test/cctest/test-api.cc
	lib/tls.js
	src/node.h
	src/node_version.h

2013-11-18 13:41:17 -08:00

..

addons

test: modify async native test.js to test for #4820

2013-02-21 13:14:07 -08:00

disabled

fixes #6031 spelling errors

2013-08-19 16:42:16 -07:00

fixtures

tls: add ECDH ciphers support

2013-10-30 08:34:47 +01:00

gc

test: fix up weakref.cc after v8 api change

2013-10-23 09:17:32 -07:00

internet

tls: reuse hostname from underlying net.Socket

2013-10-31 01:57:17 +04:00

message

vm: update API to use options argument

2013-08-28 22:27:24 -07:00

pummel

fs: make fs.watch() non-recursive by default

2013-11-05 08:27:05 +01:00

simple

Merge remote-tracking branch 'upstream/v0.10'

2013-11-18 13:41:17 -08:00

common.js

src: update after v8 api changes

2013-10-23 09:17:31 -07:00