diff options
| author | isaacs <i@izs.me> | 2013-06-04 14:38:10 -0700 |
|---|---|---|
| committer | isaacs <i@izs.me> | 2013-06-04 14:38:10 -0700 |
| commit | fe0434ce1ea5db153d11d77531b8d53e14e95802 (patch) | |
| tree | f9a6438ac5ea9ffcf42bf179c5b6be5155700e75 | |
| parent | 96c30df10cdfa4d53083ae64ca9e11f9d1311988 (diff) | |
| parent | 25e51c396aa23018603baae2b1d9390f5d9db496 (diff) | |
| download | node-new-fe0434ce1ea5db153d11d77531b8d53e14e95802.tar.gz | |
Merge branch 'v0.10.10-release' into v0.10
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | src/node_version.h | 2 |
2 files changed, 13 insertions, 2 deletions
@@ -1,4 +1,15 @@ -2013.05.30, Version 0.10.9 (Stable) +2013.06.04, Version 0.10.10 (Stable) + +* uv: Upgrade to 0.10.10 + +* npm: Upgrade to 1.2.25 + +* url: Properly parse certain oddly formed urls (isaacs) + +* stream: unshift('') is a noop (isaacs) + + +2013.05.30, Version 0.10.9 (Stable), 878ffdbe6a8eac918ef3a7f13925681c3778060b * npm: Upgrade to 1.2.24 diff --git a/src/node_version.h b/src/node_version.h index 5bf51363ca..a693127ddf 100644 --- a/src/node_version.h +++ b/src/node_version.h @@ -26,7 +26,7 @@ #define NODE_MINOR_VERSION 10 #define NODE_PATCH_VERSION 10 -#define NODE_VERSION_IS_RELEASE 0 +#define NODE_VERSION_IS_RELEASE 1 #ifndef NODE_TAG # define NODE_TAG "" |