diff --git a/.mailmap b/.mailmap index 5dc4075e..9975da08 100644 --- a/.mailmap +++ b/.mailmap @@ -6,6 +6,7 @@ Brian White Brian White Frank Denis Isaac Z. Schlueter +Marc Schlaich Robert Mustacchi Ryan Dahl Ryan Emery diff --git a/AUTHORS b/AUTHORS index 32631467..4d0968e4 100644 --- a/AUTHORS +++ b/AUTHORS @@ -87,3 +87,5 @@ Wynn Wilkes Andrei Sedoi Chris Bank Geert Jansen +Alex Gaynor +huxingyi diff --git a/ChangeLog b/ChangeLog index b4e9099b..80908700 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2013.12.13, Version 0.10.20 (Stable) + +Changes since version 0.10.19: + +* linux: fix up SO_REUSEPORT back-port (Ben Noordhuis) + +* fs-event: fix invalid memory access (huxingyi) + + 2013.11.13, Version 0.10.19 (Stable), 33959f7524090b8d2c6c41e2400ca77e31755059 Changes since version 0.10.18: diff --git a/src/version.c b/src/version.c index ef5cf14d..252101eb 100644 --- a/src/version.c +++ b/src/version.c @@ -35,7 +35,7 @@ #define UV_VERSION_MAJOR 0 #define UV_VERSION_MINOR 10 #define UV_VERSION_PATCH 20 -#define UV_VERSION_IS_RELEASE 0 +#define UV_VERSION_IS_RELEASE 1 #define UV_VERSION ((UV_VERSION_MAJOR << 16) | \