Prepare push to trunk. Now working on version 3.12.0.

R=danno@chromium.org

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

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

diff --git a/ChangeLog b/ChangeLog
index 46a6663..fae15e5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2012-06-13: Version 3.11.10
+
+        Implemented heap profiler memory usage reporting.
+
+        Preserved error message during finally block in try..finally.
+        (Chromium issue 129171)
+
+        Fixed EnsureCanContainElements to properly handle double values.
+        (issue 2170)
+
+        Improved heuristics to keep objects in fast mode with inherited
+        constructors.
+
+        Performance and stability improvements on all platforms.
+
+
 2012-06-06: Version 3.11.9
 
         Implemented ES5-conformant semantics for inherited setters and read-only

diff --git a/src/version.cc b/src/version.cc
index 1cba1b7..744ec6b 100644 (file)
--- a/src/version.cc
+++ b/src/version.cc
@@ -33,8 +33,8 @@
 // NOTE these macros are used by the SCons build script so their names
 // cannot be changed without changing the SCons build script.
 #define MAJOR_VERSION     3
-#define MINOR_VERSION     11
-#define BUILD_NUMBER      10
+#define MINOR_VERSION     12
+#define BUILD_NUMBER      0
 #define PATCH_LEVEL       0
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)