Mercurial > hg > openjdk > bsd-port > corba
changeset 358:7d8fe33fef5f
Merge from main OpenJDK repository
author | Greg Lewis <glewis@eyesbeyond.com> |
---|---|
date | Fri, 27 May 2011 00:00:37 -0700 |
parents | bd74f8f190b3 (current diff) 74eb715474f2 (diff) |
children | 0081325fc7ca |
files | |
diffstat | 2 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Fri May 20 20:03:53 2011 -0700 +++ b/.hgtags Fri May 27 00:00:37 2011 -0700 @@ -118,3 +118,4 @@ a58635cdd921bafef353f4864184a0481353197b jdk7-b141 a2f340a048c88d10cbedc0504f5cf03d39925a40 jdk7-b142 51ed32f6f4de56f16e910ac54ba6c6f6606f4f17 jdk7-b143 +7033a5756ad552d88114594d8e2d2e4dc2c05963 jdk7-b144
--- a/src/share/classes/com/sun/corba/se/impl/transport/CorbaTransportManagerImpl.java Fri May 20 20:03:53 2011 -0700 +++ b/src/share/classes/com/sun/corba/se/impl/transport/CorbaTransportManagerImpl.java Fri May 27 00:00:37 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, 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