summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AUTHORS5
-rw-r--r--ChangeLog15
-rw-r--r--src/node_version.h2
3 files changed, 20 insertions, 2 deletions
diff --git a/AUTHORS b/AUTHORS
index dbdf9247bd..63f04692dd 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -442,3 +442,8 @@ Kelly Gerber <kellygerber22@yahoo.com>
Ryan Doenges <rhdoenges@gmail.com>
Sean Silva <chisophugis@gmail.com>
Miroslav Bajtoš <miro.bajtos@gmail.com>
+Sam Roberts <vieuxtech@gmail.com>
+Kevin Locke <kevin@kevinlocke.name>
+Daniel Moore <polaris@northhorizon.net>
+Robert Kowalski <rok@kowalski.gd>
+Benoit Vallée <github@benoitvallee.net>
diff --git a/ChangeLog b/ChangeLog
index 6439ef11b5..cd00e9b5dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,17 @@
-2013.04.23, Version 0.10.5 (Stable)
+2013.05.14, Version 0.10.6 (Stable)
+
+* module: Deprecate require.extensions (isaacs)
+
+* stream: make Readable.wrap support objectMode, empty streams (Daniel Moore)
+
+* child_process: fix handle delivery (Ben Noordhuis)
+
+* crypto: Fix performance regression (isaacs)
+
+* src: DRY string encoding/decoding (isaacs)
+
+
+2013.04.23, Version 0.10.5 (Stable), deeaf8fab978e3cadb364e46fb32dafdebe5f095
* uv: Upgrade to 0.10.5 (isaacs)
diff --git a/src/node_version.h b/src/node_version.h
index 65b1176d27..401d9cec24 100644
--- a/src/node_version.h
+++ b/src/node_version.h
@@ -26,7 +26,7 @@
#define NODE_MINOR_VERSION 10
#define NODE_PATCH_VERSION 6
-#define NODE_VERSION_IS_RELEASE 0
+#define NODE_VERSION_IS_RELEASE 1
#ifndef NODE_TAG
# define NODE_TAG ""