Prepare push to trunk. Now working on version 3.12.6.

R=jkummerow@chromium.org
BUG=
TEST=

Review URL: https://chromiumcodereview.appspot.com/10710010

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

diff --git a/ChangeLog b/ChangeLog
index 6663c66614b5822009848ff01c42098fe7733bcd..a70737988252c56b5879c8a93d71a5b5abe17233 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2012-06-28: Version 3.12.5
+
+        Fixed lazy parsing heuristics to respect outer scope.
+        (Chromium issue 135008)
+
+        Allow using test-wrapper-gypbuild.py on Windows when no python
+        interpreter is registered.
+
+        Performance and stability improvements on all platforms.
+
+
 2012-06-27: Version 3.12.4
 
         Removed -fomit-frame-pointer flag from Release builds to make

diff --git a/src/version.cc b/src/version.cc
index d9ff566025c988b951c33132d4413621a7e354cd..bda2732959c0a49fc0f76b74c98b0b3c086efe7f 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     3
 #define MINOR_VERSION     12
-#define BUILD_NUMBER      5
+#define BUILD_NUMBER      6
 #define PATCH_LEVEL       0
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)