Mercurial > hg > openjdk > lambda > corba
changeset 253:66fa0fcc7792 jdk7-b129
Merge
author | ohair |
---|---|
date | Fri, 04 Feb 2011 07:47:37 -0800 |
parents | 3ff9acc7cc06 (current diff) 6a3903e5b6cc (diff) |
children | 4cdf9b86f550 |
files | |
diffstat | 8 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/com/sun/corba/se/spi/logging/data/Activation.mc Thu Feb 03 17:22:01 2011 -0800 +++ b/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/src/share/classes/com/sun/corba/se/spi/logging/data/IOR.mc Thu Feb 03 17:22:01 2011 -0800 +++ b/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/src/share/classes/com/sun/corba/se/spi/logging/data/Interceptors.mc Thu Feb 03 17:22:01 2011 -0800 +++ b/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/src/share/classes/com/sun/corba/se/spi/logging/data/Naming.mc Thu Feb 03 17:22:01 2011 -0800 +++ b/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/src/share/classes/com/sun/corba/se/spi/logging/data/OMG.mc Thu Feb 03 17:22:01 2011 -0800 +++ b/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/src/share/classes/com/sun/corba/se/spi/logging/data/ORBUtil.mc Thu Feb 03 17:22:01 2011 -0800 +++ b/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/src/share/classes/com/sun/corba/se/spi/logging/data/POA.mc Thu Feb 03 17:22:01 2011 -0800 +++ b/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/src/share/classes/com/sun/corba/se/spi/logging/data/Util.mc Thu Feb 03 17:22:01 2011 -0800 +++ b/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