Prepare push to trunk. Now working on version 2.1.8.

Review URL: http://codereview.chromium.org/1164001

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@4204 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/ChangeLog b/ChangeLog
index 7e8c0deb59db5a91db0a7f9d9aad42f22336d7f4..0786ed929692dd590b661ddbb225760f3d9f381a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,23 @@
-2010-03-17: Version 2.1.5
+2010-03-22: Version 2.1.7
+
+        Fixed issue 650.
+
+        Fixed a bug where __proto__ was sometimes enumerated (issue 646).
+
+        Performance improvements for arithmetic operations.
+
+        Performance improvements for string operations.
+
+        Print script name and line number information in stack trace.
+
+
+2010-03-17: Version 2.1.6
 
         Performance improvements for arithmetic operations.
 
         Performance improvements for string operations.
 
+
 2010-03-10: Version 2.1.4
 
         Fixed code cache lookup for keyed IC's (issue http://crbug.com/37853).

diff --git a/src/version.cc b/src/version.cc
index e662941a5013c141ff366782137829beb8690022..a4c0f4eb163af172d85423b26776d7ee3ab971ec 100644 (file)
--- a/src/version.cc
+++ b/src/version.cc
@@ -34,7 +34,7 @@
 // cannot be changed without changing the SCons build script.
 #define MAJOR_VERSION     2
 #define MINOR_VERSION     1
-#define BUILD_NUMBER      7
+#define BUILD_NUMBER      8
 #define PATCH_LEVEL       0
 #define CANDIDATE_VERSION true