Reviewers: Rico,

Description:
Push r6593 from bleeding_edge to 3.0 branch.

Please review this at http://codereview.chromium.org/6286075/

SVN Base: http://v8.googlecode.com/svn/branches/3.0/

Affected files:
  A  +  LICENSE.strongtalk
  A  +  LICENSE.v8
  A  +  LICENSE.valgrind
  D     src/third_party/strongtalk/LICENSE
  D     src/third_party/strongtalk/README.chromium
  M     src/version.cc


### BEGIN SVN COPY METADATA
#$ cp branches/bleeding_edge/LICENSE.v8 LICENSE.v8
#$ cp branches/bleeding_edge/LICENSE.strongtalk LICENSE.strongtalk
#$ cp branches/bleeding_edge/LICENSE.valgrind LICENSE.valgrind
### END SVN COPY METADATA
Index: LICENSE.strongtalk
Index: LICENSE.v8
Index: LICENSE.valgrind
Index: src/third_party/strongtalk/LICENSE
===================================================================
--- src/third_party/strongtalk/LICENSE  (revision 6593)
+++ src/third_party/strongtalk/LICENSE  (working copy)
@@ -1,29 +0,0 @@
-Copyright (c) 1994-2006 Sun Microsystems Inc.
-All Rights Reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-- Redistributions of source code must retain the above copyright notice,
-  this list of conditions and the following disclaimer.
-
-- Redistribution in binary form must reproduce the above copyright
-  notice, this list of conditions and the following disclaimer in the
-  documentation and/or other materials provided with the distribution.
-
-- Neither the name of Sun Microsystems or the names of contributors may
-  be used to endorse or promote products derived from this software without
-  specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Index: src/third_party/strongtalk/README.chromium
===================================================================
--- src/third_party/strongtalk/README.chromium  (revision 6593)
+++ src/third_party/strongtalk/README.chromium  (working copy)
@@ -1,18 +0,0 @@
-Name: Strongtalk
-URL: http://www.strongtalk.org/
-
-Code from the Strongtalk assembler is used with modification in the following
-files:
-
-src/assembler.h
-src/assembler.cc
-src/arm/assembler-arm.cc
-src/arm/assembler-arm.h
-src/arm/assembler-arm-inl.h
-src/ia32/assembler-ia32.cc
-src/ia32/assembler-ia32.h
-src/ia32/assembler-ia32-inl.h
-src/mips/assembler-mips.cc
-src/mips/assembler-mips.h
-src/mips/assembler-mips-inl.h
-src/x64/assembler-x64.h
Index: src/version.cc
===================================================================
--- src/version.cc      (revision 6593)
+++ src/version.cc      (working copy)
@@ -35,7 +35,7 @@
 #define MAJOR_VERSION     3
 #define MINOR_VERSION     0
 #define BUILD_NUMBER      12
-#define PATCH_LEVEL       8
+#define PATCH_LEVEL       9
 #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

Reply via email to