From da00413196e432247346d9e587f8c78ce5ceb087 Mon Sep 17 00:00:00 2001
From: Ryan Dahl <ry@tinyclouds.org>
Date: Wed, 20 Jan 2010 11:28:32 -0800
Subject: [PATCH] bump version

---
 ChangeLog      | 25 ++++++++++++++++++++++++-
 doc/api.txt    |  2 +-
 doc/index.html |  4 ++--
 wscript        |  2 +-
 4 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 102a2cd996..85d0c2b398 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,27 @@
-2010.01.09, Version 0.1.25
+2010.01.20, Version 0.1.26
+
+  * Bugfix, HTTP eof causing crash (Ben Williamson)
+
+  * Better error message on SyntaxError
+
+  * API: Move Promise and EventEmitter into 'events' module
+
+  * API: Add process.nextTick()
+
+  * Allow optional params to setTimeout, setInterval
+    (Michaeljohn Clement)
+
+  * API: change some Promise behavior (Felix Geisendörfer)
+    - Removed Promise.cancel()
+    - Support late callback binding
+    - Make unhandled Promise errors throw an exception
+
+  * Upgrade V8 to 2.0.6.1
+
+  * Solaris port
+
+
+2010.01.09, Version 0.1.25, 39ca93549af91575ca9d4cbafd1e170fbcef3dfa
 
   * sys.inspect() improvements (Tim Caswell)
 
diff --git a/doc/api.txt b/doc/api.txt
index e72fbe51ce..74a73b9db5 100644
--- a/doc/api.txt
+++ b/doc/api.txt
@@ -1,7 +1,7 @@
 NODE(1)
 =======
 Ryan Dahl <ry@tinyclouds.org>
-Version, 0.1.25, 2010.01.09
+Version, 0.1.26, 2010.01.20
 
 
 == NAME
diff --git a/doc/index.html b/doc/index.html
index 9f6fe21a70..fe8800a18b 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -97,9 +97,9 @@ server.listen(7000, "localhost");</pre>
         <a href="http://github.com/ry/node/tree/master">git repo</a>
       </p>
       <p>
-        2010.01.09
+        2010.01.20
         <a
-        href="http://s3.amazonaws.com/four.livejournal/20100109/node-v0.1.25.tar.gz">node-v0.1.25.tar.gz</a>
+        href="http://s3.amazonaws.com/four.livejournal/20100120/node-v0.1.26.tar.gz">node-v0.1.26.tar.gz</a>
       </p>
 
       <h2 id="build">Build</h2>
diff --git a/wscript b/wscript
index 89be9aa2b2..8e2a79cf4a 100644
--- a/wscript
+++ b/wscript
@@ -7,7 +7,7 @@ from os.path import join, dirname, abspath
 from logging import fatal
 
 cwd = os.getcwd()
-VERSION="0.1.25"
+VERSION="0.1.26"
 APPNAME="node.js"
 
 import js2c