summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorisaacs <i@izs.me>2013-06-13 13:21:31 -0700
committerisaacs <i@izs.me>2013-06-13 13:21:31 -0700
commit7f52ee086a4d00d1b8d5f4c9ff805ac8e8316835 (patch)
treeb95acd260c122cfd49083fd44b84765981a27a2a
parenta0837fd32e8b8d6c4586c035b4d760273c05e2cd (diff)
parent0b9bdb2bc7e1c872f0ea4713517fda22a4b0b202 (diff)
downloadnode-7f52ee086a4d00d1b8d5f4c9ff805ac8e8316835.tar.gz
Merge branch 'v0.8.25-release' into v0.8
-rw-r--r--ChangeLog9
-rw-r--r--src/node_version.h2
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 23686815e..5999f992d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,11 @@
-2013.06.04, Version 0.8.24 (maintenance)
+2013.06.13, Version 0.8.25 (maintenance)
+
+* npm: Upgrade to 1.2.30
+
+* child_process: fix handle delivery (Ben Noordhuis)
+
+
+2013.06.04, Version 0.8.24 (maintenance), c1a1ab067721ea17ef7b05ec5c68b01321017f05
* npm: Upgrade to v1.2.24
diff --git a/src/node_version.h b/src/node_version.h
index 9c2bd79a9..7eca55d66 100644
--- a/src/node_version.h
+++ b/src/node_version.h
@@ -30,7 +30,7 @@
# define NODE_TAG ""
#endif
-#define NODE_VERSION_IS_RELEASE 0
+#define NODE_VERSION_IS_RELEASE 1
#ifndef NODE_STRINGIFY
#define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n)