summaryrefslogtreecommitdiffstats
path: root/LICENSE
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2012-03-05 14:35:55 +0000
committerBen Murdoch <benm@google.com>2012-04-11 15:40:15 +0100
commitc7cc028aaeedbbfa11c11d0b7b243b3d9e837ed9 (patch)
tree6f84ef396408af3c9f08eaac783ecf1a957b0fee /LICENSE
parent592a9fc1d8ea420377a2e7efd0600e20b058be2b (diff)
downloadandroid_external_v8-c7cc028aaeedbbfa11c11d0b7b243b3d9e837ed9.tar.gz
android_external_v8-c7cc028aaeedbbfa11c11d0b7b243b3d9e837ed9.tar.bz2
android_external_v8-c7cc028aaeedbbfa11c11d0b7b243b3d9e837ed9.zip
Merge V8 at 3.8.9.11
Bug: 5688872 Change-Id: Ie3b1dd67a730ec5e82686b7b37dba26f6a9bb24f
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE6
1 files changed, 4 insertions, 2 deletions
diff --git a/LICENSE b/LICENSE
index e435050e..2e516bab 100644
--- a/LICENSE
+++ b/LICENSE
@@ -14,7 +14,9 @@ are:
- Strongtalk assembler, the basis of the files assembler-arm-inl.h,
assembler-arm.cc, assembler-arm.h, assembler-ia32-inl.h,
- assembler-ia32.cc, assembler-ia32.h, assembler.cc and assembler.h.
+ assembler-ia32.cc, assembler-ia32.h, assembler-x64-inl.h,
+ assembler-x64.cc, assembler-x64.h, assembler-mips-inl.h,
+ assembler-mips.cc, assembler-mips.h, assembler.cc and assembler.h.
This code is copyrighted by Sun Microsystems Inc. and released
under a 3-clause BSD license.
@@ -24,7 +26,7 @@ are:
These libraries have their own licenses; we recommend you read them,
as their terms may differ from the terms below.
-Copyright 2006-2011, the V8 project authors. All rights reserved.
+Copyright 2006-2012, the V8 project authors. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met: