Prepare push to trunk. Now working on version 2.5.0.

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

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

diff --git a/ChangeLog b/ChangeLog
index 42de286..367434e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-13: Version 2.5.0
+
+        Fixed a bug in the handling of conditional expressions in test
+        contexts in compiler for top-level code.
+
+        Added "//@ sourceURL" information to the StackTrace API.
+
+        Exposed RegExp construction through the API.
+
+
 2010-10-04: Version 2.4.8
 
         Fixed a bug in ResumeProfilerEx causing it to not always write out the

diff --git a/src/version.cc b/src/version.cc
index c62da8f..5300b30 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     2
-#define MINOR_VERSION     4
-#define BUILD_NUMBER      9
+#define MINOR_VERSION     5
+#define BUILD_NUMBER      0
 #define PATCH_LEVEL       0
 #define CANDIDATE_VERSION true