Merge

Thu, 25 Oct 2012 20:05:36 -0700

author
lana
date
Thu, 25 Oct 2012 20:05:36 -0700
changeset 412
9094cd4a614f
parent 408
bbaef650c3d2
parent 411
23e0226a31ac
child 414
6ccbf67b68bf
child 417
aac74d377a03

Merge

make/common/shared/Defs-utils.gmk file | annotate | diff | comparison | revisions
     1.1 --- a/make/common/Defs-bsd.gmk	Thu Oct 25 09:53:01 2012 -0700
     1.2 +++ b/make/common/Defs-bsd.gmk	Thu Oct 25 20:05:36 2012 -0700
     1.3 @@ -1,5 +1,5 @@
     1.4  #
     1.5 -# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
     1.6 +# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
     1.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8  #
     1.9  # This code is free software; you can redistribute it and/or modify it
     2.1 --- a/make/common/internal/Resources.gmk	Thu Oct 25 09:53:01 2012 -0700
     2.2 +++ b/make/common/internal/Resources.gmk	Thu Oct 25 20:05:36 2012 -0700
     2.3 @@ -1,5 +1,5 @@
     2.4  #
     2.5 -# Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
     2.6 +# Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
     2.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.8  #
     2.9  # This code is free software; you can redistribute it and/or modify it
     3.1 --- a/make/common/shared/Defs-bsd.gmk	Thu Oct 25 09:53:01 2012 -0700
     3.2 +++ b/make/common/shared/Defs-bsd.gmk	Thu Oct 25 20:05:36 2012 -0700
     3.3 @@ -1,5 +1,5 @@
     3.4  #
     3.5 -# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
     3.6 +# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
     3.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     3.8  #
     3.9  # This code is free software; you can redistribute it and/or modify it
     4.1 --- a/make/common/shared/Defs-utils.gmk	Thu Oct 25 09:53:01 2012 -0700
     4.2 +++ b/make/common/shared/Defs-utils.gmk	Thu Oct 25 20:05:36 2012 -0700
     4.3 @@ -1,5 +1,5 @@
     4.4  #
     4.5 -# Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved.
     4.6 +# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
     4.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     4.8  #
     4.9  # This code is free software; you can redistribute it and/or modify it
     5.1 --- a/make/tools/src/build/tools/stripproperties/StripPropertiesCorba.java	Thu Oct 25 09:53:01 2012 -0700
     5.2 +++ b/make/tools/src/build/tools/stripproperties/StripPropertiesCorba.java	Thu Oct 25 20:05:36 2012 -0700
     5.3 @@ -1,5 +1,5 @@
     5.4  /*
     5.5 - * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
     5.6 + * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
     5.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     5.8   *
     5.9   * This code is free software; you can redistribute it and/or modify it
     6.1 --- a/make/tools/strip_properties/Makefile	Thu Oct 25 09:53:01 2012 -0700
     6.2 +++ b/make/tools/strip_properties/Makefile	Thu Oct 25 20:05:36 2012 -0700
     6.3 @@ -1,5 +1,5 @@
     6.4  #
     6.5 -# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
     6.6 +# Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
     6.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     6.8  #
     6.9  # This code is free software; you can redistribute it and/or modify it

mercurial