Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorohair
Fri, 04 Feb 2011 07:47:37 -0800
changeset 8087 c9679be023bb
parent 8085 6dabff7484b7 (current diff)
parent 8086 77a9c707a04e (diff)
child 8088 fcef91e8fc03
Merge
--- a/corba/src/share/classes/com/sun/corba/se/spi/logging/data/Activation.mc	Thu Feb 03 17:22:01 2011 -0800
+++ b/corba/src/share/classes/com/sun/corba/se/spi/logging/data/Activation.mc	Fri Feb 04 07:47:37 2011 -0800
@@ -1,5 +1,5 @@
 ;
-; Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+; Copyright (c) 2003, Oracle and/or its affiliates. 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/corba/src/share/classes/com/sun/corba/se/spi/logging/data/IOR.mc	Thu Feb 03 17:22:01 2011 -0800
+++ b/corba/src/share/classes/com/sun/corba/se/spi/logging/data/IOR.mc	Fri Feb 04 07:47:37 2011 -0800
@@ -1,5 +1,5 @@
 ;
-; Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+; Copyright (c) 2003, Oracle and/or its affiliates. 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/corba/src/share/classes/com/sun/corba/se/spi/logging/data/Interceptors.mc	Thu Feb 03 17:22:01 2011 -0800
+++ b/corba/src/share/classes/com/sun/corba/se/spi/logging/data/Interceptors.mc	Fri Feb 04 07:47:37 2011 -0800
@@ -1,5 +1,5 @@
 ;
-; Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+; Copyright (c) 2003, Oracle and/or its affiliates. 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/corba/src/share/classes/com/sun/corba/se/spi/logging/data/Naming.mc	Thu Feb 03 17:22:01 2011 -0800
+++ b/corba/src/share/classes/com/sun/corba/se/spi/logging/data/Naming.mc	Fri Feb 04 07:47:37 2011 -0800
@@ -1,5 +1,5 @@
 ;
-; Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+; Copyright (c) 2003, Oracle and/or its affiliates. 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/corba/src/share/classes/com/sun/corba/se/spi/logging/data/OMG.mc	Thu Feb 03 17:22:01 2011 -0800
+++ b/corba/src/share/classes/com/sun/corba/se/spi/logging/data/OMG.mc	Fri Feb 04 07:47:37 2011 -0800
@@ -1,5 +1,5 @@
 ;
-; Copyright 2003-2004 Sun Microsystems, Inc.  All Rights Reserved.
+; Copyright (c) 2003, 2004, Oracle and/or its affiliates. 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/corba/src/share/classes/com/sun/corba/se/spi/logging/data/ORBUtil.mc	Thu Feb 03 17:22:01 2011 -0800
+++ b/corba/src/share/classes/com/sun/corba/se/spi/logging/data/ORBUtil.mc	Fri Feb 04 07:47:37 2011 -0800
@@ -1,6 +1,6 @@
 ;
 
-; Copyright 2003-2009 Sun Microsystems, Inc.  All Rights Reserved.
+; Copyright (c) 2003, 2009, Oracle and/or its affiliates. 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/corba/src/share/classes/com/sun/corba/se/spi/logging/data/POA.mc	Thu Feb 03 17:22:01 2011 -0800
+++ b/corba/src/share/classes/com/sun/corba/se/spi/logging/data/POA.mc	Fri Feb 04 07:47:37 2011 -0800
@@ -1,5 +1,5 @@
 ;
-; Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+; Copyright (c) 2003, Oracle and/or its affiliates. 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/corba/src/share/classes/com/sun/corba/se/spi/logging/data/Util.mc	Thu Feb 03 17:22:01 2011 -0800
+++ b/corba/src/share/classes/com/sun/corba/se/spi/logging/data/Util.mc	Fri Feb 04 07:47:37 2011 -0800
@@ -1,5 +1,5 @@
 ;
-; Copyright 2003-2004 Sun Microsystems, Inc.  All Rights Reserved.
+; Copyright (c) 2003, 2004, Oracle and/or its affiliates. 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
jdk-sandbox