Merge

Fri, 17 Jul 2009 00:50:55 -0700

author
kvn
date
Fri, 17 Jul 2009 00:50:55 -0700
changeset 1289
606c988ff684
parent 1288
64219d2a6493
parent 1287
84770322b304
child 1290
f9094a5e1c8a
child 1291
75596850f863
child 1330
94b6d06fd759

Merge

     1.1 --- a/test/compiler/6837094/Test.java	Thu Jul 16 16:29:55 2009 -0700
     1.2 +++ b/test/compiler/6837094/Test.java	Fri Jul 17 00:50:55 2009 -0700
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
     1.6 + * Copyright 2009 Google Inc.  All Rights Reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
     2.1 --- a/test/compiler/6860469/Test.java	Thu Jul 16 16:29:55 2009 -0700
     2.2 +++ b/test/compiler/6860469/Test.java	Fri Jul 17 00:50:55 2009 -0700
     2.3 @@ -1,5 +1,5 @@
     2.4  /*
     2.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
     2.6 + * Copyright 2009 Google Inc.  All Rights Reserved.
     2.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.8   *
     2.9   * This code is free software; you can redistribute it and/or modify it

mercurial