diff options
| author | Julien Gilli <julien.gilli@joyent.com> | 2015-05-22 23:47:12 -0700 |
|---|---|---|
| committer | Julien Gilli <julien.gilli@joyent.com> | 2015-05-22 23:47:12 -0700 |
| commit | 1150bec595474a8a1cf19da5250e12df787102ff (patch) | |
| tree | 8e3e0444f4bbd1577a81a63ddfa29599748a4cb8 | |
| parent | 202c18bbc3e134ed3e97f530749cb9f9ac60ce53 (diff) | |
| parent | 0a604e92e258c5ee2752d763e50721e35053f135 (diff) | |
| download | node-1150bec595474a8a1cf19da5250e12df787102ff.tar.gz | |
Merge branch 'v0.12.4-release' into v0.12
| -rw-r--r-- | AUTHORS | 2 | ||||
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | src/node_version.h | 2 |
3 files changed, 13 insertions, 2 deletions
@@ -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 @@ -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 diff --git a/src/node_version.h b/src/node_version.h index ab5b0d4df..10113b2db 100644 --- 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 "" |