Merge branch 'v0.10' into v1.x

Conflicts:
	ChangeLog
	src/version.c
	test/test-list.h
	test/test-loop-configure.c
	uv.gyp
This commit is contained in:
Saúl Ibarra Corretgé 2015-01-28 21:49:25 +01:00
commit a30021de07

View File

@ -1,3 +1,12 @@
2015.01.29, Version 0.10.33 (Stable), 7a2253d33ad8215a26c1b34f1952aee7242dd687
Changes since version 0.10.32:
* linux: fix epoll_pwait() regression with < 2.6.19 (Ben Noordhuis)
* test: back-port uv_loop_configure() test (Ben Noordhuis)
2015.01.15, Version 1.2.1 (Stable), 4ca78e989062a1099dc4b9ad182a98e8374134b1
Changes since version 1.2.0: