OpenJDK / jdk / jdk12
changeset 14240:d365a845f1cf
Merge
| author | lana |
|---|---|
| date | Tue, 23 Oct 2012 09:40:43 -0700 |
| parents | c5f2cddd1f98 11ac4468449e |
| children | a5c5a8f5b9e6 |
| files | |
| diffstat | 6 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/corba/make/common/Defs-bsd.gmk Thu Oct 18 11:07:46 2012 -0700 +++ b/corba/make/common/Defs-bsd.gmk Tue Oct 23 09:40:43 2012 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1999, 2012, 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/make/common/internal/Resources.gmk Thu Oct 18 11:07:46 2012 -0700 +++ b/corba/make/common/internal/Resources.gmk Tue Oct 23 09:40:43 2012 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2012, 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/make/common/shared/Defs-bsd.gmk Thu Oct 18 11:07:46 2012 -0700 +++ b/corba/make/common/shared/Defs-bsd.gmk Tue Oct 23 09:40:43 2012 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2012, 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/make/common/shared/Defs-utils.gmk Thu Oct 18 11:07:46 2012 -0700 +++ b/corba/make/common/shared/Defs-utils.gmk Tue Oct 23 09:40:43 2012 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2012, 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/make/tools/src/build/tools/stripproperties/StripPropertiesCorba.java Thu Oct 18 11:07:46 2012 -0700 +++ b/corba/make/tools/src/build/tools/stripproperties/StripPropertiesCorba.java Tue Oct 23 09:40:43 2012 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2012, 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/make/tools/strip_properties/Makefile Thu Oct 18 11:07:46 2012 -0700 +++ b/corba/make/tools/strip_properties/Makefile Tue Oct 23 09:40:43 2012 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1998, 2012, 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