Mercurial > hg > openjdk > jigsaw > corba
changeset 447:9094cd4a614f
Merge
author | lana |
---|---|
date | Thu, 25 Oct 2012 20:05:36 -0700 |
parents | bbaef650c3d2 (current diff) 23e0226a31ac (diff) |
children | 6ccbf67b68bf aac74d377a03 |
files | make/common/shared/Defs-utils.gmk |
diffstat | 6 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/make/common/Defs-bsd.gmk Thu Oct 25 09:53:01 2012 -0700 +++ b/make/common/Defs-bsd.gmk Thu Oct 25 20:05:36 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/make/common/internal/Resources.gmk Thu Oct 25 09:53:01 2012 -0700 +++ b/make/common/internal/Resources.gmk Thu Oct 25 20:05:36 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/make/common/shared/Defs-bsd.gmk Thu Oct 25 09:53:01 2012 -0700 +++ b/make/common/shared/Defs-bsd.gmk Thu Oct 25 20:05:36 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/make/common/shared/Defs-utils.gmk Thu Oct 25 09:53:01 2012 -0700 +++ b/make/common/shared/Defs-utils.gmk Thu Oct 25 20:05:36 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/make/tools/src/build/tools/stripproperties/StripPropertiesCorba.java Thu Oct 25 09:53:01 2012 -0700 +++ b/make/tools/src/build/tools/stripproperties/StripPropertiesCorba.java Thu Oct 25 20:05:36 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/make/tools/strip_properties/Makefile Thu Oct 25 09:53:01 2012 -0700 +++ b/make/tools/strip_properties/Makefile Thu Oct 25 20:05:36 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