Merge branch 'v0.12.4-release' into v0.12

10 years ago · 1150bec595
3 changed files with 13 additions and 2 deletions
--- a/2
+++ b/2
@ -99,6 +99,7 @@ Cam Swords
 Carlos Campderrós
 Carson McDonald
 Carter Allen
+Chad Johnston
 Chad Rhyner
 Chandra Sekar S
 Charles
@ -496,6 +497,7 @@ Rasmus Christian Pedersen
 Ray Morgan
 Ray Solomon
 Raymond Feng
+Rebecca Turner
 Refael Ackermann
 Reid Burke
 Rhys Jones
--- a/11
+++ b/11
@ -1,4 +1,13 @@
-2015.05.13, Version 0.12.3 (Stable)
+2015.05.22, Version 0.12.4 (Stable)
+
+* npm: upgrade to 2.10.1
+
+* V8: revert v8 Array.prototype.values() removal (cjihrig)
+
+* win: bring back xp/2k3 support (Bert Belder)
+
+
+2015.05.13, Version 0.12.3 (Stable), 03431c7d7b4b4a3054ca8ae2cfa8009e3e84a2c7

 * V8: update to 3.28.71.19

--- a/src/node_version.h
+++ b/src/node_version.h
@ -26,7 +26,7 @@
 #define NODE_MINOR_VERSION 12
 #define NODE_PATCH_VERSION 4

-#define NODE_VERSION_IS_RELEASE 0
+#define NODE_VERSION_IS_RELEASE 1

 #ifndef NODE_TAG
 # define NODE_TAG ""