Jeremiah Senkpiel 79a7a86d4d Merge branch 'v1.x' ... PR-URL: https://github.com/iojs/io.js/pull/1582 Reviewed-By: Chris Dickinson <christopher.s.dickinson@gmail.com> Conflicts: src/node_version.h		2015-05-01 20:08:55 -04:00
..
addons	smalloc: extend user API	2015-02-20 11:02:33 -07:00
cctest	deps: check in gtest, add util unit test	2015-04-01 22:35:56 +02:00
debugger	debugger: don't spawn child process in remote mode	2015-03-27 17:28:48 +01:00
disabled	Remove excessive copyright/license boilerplate	2015-01-12 15:30:28 -08:00
fixtures	tls: use `SSL_set_cert_cb` for async SNI/OCSP	2015-05-01 16:56:55 +02:00
gc	test: common.js -> common	2015-02-22 19:34:17 -08:00
internet	crypto: add deprecated ValiCert CA for cross cert	2015-03-13 20:18:54 +09:00
message	node: allow multiple arguments passed to nextTick	2015-04-15 17:02:21 -06:00
parallel	Merge branch 'v1.x'	2015-05-01 20:08:55 -04:00
pummel	test: fix ext commands to be double quoted	2015-03-12 17:35:20 -07:00
sequential	test: extend timeouts for ARMv6	2015-04-29 19:28:11 +10:00
testpy	test: fix `make test-addons` target	2015-01-12 23:21:51 +01:00
timers	test: make test runner multi-arch/mode compatible	2014-10-16 22:39:34 +02:00
common.js	test: extend timeouts for ARMv6	2015-04-29 19:28:11 +10:00