Reviewers: Erik Corry, Description: Merge bleeding_e...@2053 and bleeding_e...@2056 to trunk.
Please review this at http://codereview.chromium.org/113889 SVN Base: http://v8.googlecode.com/svn/trunk/ Affected files: M AUTHORS M src/ic.cc M src/version.cc Index: AUTHORS =================================================================== --- AUTHORS (revision 2060) +++ AUTHORS (working copy) @@ -5,12 +5,13 @@ Google Inc. -Rene Rebe <[email protected]> -Rafal Krypa <[email protected]> +Alexander Botero-Lowry <[email protected]> +Craig Schlenter <[email protected]> +Daniel Andersson <[email protected]> +Daniel James <[email protected]> Jay Freeman <[email protected]> -Daniel James <[email protected]> +Joel Stanley <[email protected]> +Matt Hanselman <[email protected]> Paolo Giarrusso <[email protected]> -Daniel Andersson <[email protected]> -Alexander Botero-Lowry <[email protected]> -Matt Hanselman <[email protected]> -Craig Schlenter <[email protected]> +Rafal Krypa <[email protected]> +Rene Rebe <[email protected]> Index: src/ic.cc =================================================================== --- src/ic.cc (revision 2060) +++ src/ic.cc (working copy) @@ -39,7 +39,7 @@ namespace internal { #ifdef DEBUG -static const char TransitionMarkFromState(IC::State state) { +static char TransitionMarkFromState(IC::State state) { switch (state) { case UNINITIALIZED: return '0'; case PREMONOMORPHIC: return 'P'; Index: src/version.cc =================================================================== --- src/version.cc (revision 2060) +++ src/version.cc (working copy) @@ -35,7 +35,7 @@ #define MAJOR_VERSION 1 #define MINOR_VERSION 2 #define BUILD_NUMBER 5 -#define PATCH_LEVEL 1 +#define PATCH_LEVEL 2 #define CANDIDATE_VERSION false // Define SONAME to have the SCons build the put a specific SONAME into the --~--~---------~--~----~------------~-------~--~----~ v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev -~----------~----~----~----~------~----~------~--~---
