changeset 3271:4c3a294df59b

Merge
author kvn
date Fri, 17 Jul 2009 00:50:55 -0700
parents 0a2825307027 86f706946453
children 5a1e113bfed5 6acf7084b1d3 d67c151b72a5
files
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hotspot/test/compiler/6837094/Test.java	Thu Jul 16 16:29:55 2009 -0700
+++ b/hotspot/test/compiler/6837094/Test.java	Fri Jul 17 00:50:55 2009 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2009 Google Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/hotspot/test/compiler/6860469/Test.java	Thu Jul 16 16:29:55 2009 -0700
+++ b/hotspot/test/compiler/6860469/Test.java	Fri Jul 17 00:50:55 2009 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2009 Google Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it