# HG changeset patch
# User lana
# Date 1351220736 25200
# Node ID 9094cd4a614f6e0de91656ffb56a9dbaace5c6bf
# Parent  bbaef650c3d2c19db54515df014ef67a3b3201f2# Parent  23e0226a31ac8b94906c93096e7cd5b96f61d741
Merge

diff -r bbaef650c3d2 -r 9094cd4a614f make/common/Defs-bsd.gmk
--- 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
diff -r bbaef650c3d2 -r 9094cd4a614f make/common/internal/Resources.gmk
--- 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
diff -r bbaef650c3d2 -r 9094cd4a614f make/common/shared/Defs-bsd.gmk
--- 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
diff -r bbaef650c3d2 -r 9094cd4a614f make/common/shared/Defs-utils.gmk
--- 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
diff -r bbaef650c3d2 -r 9094cd4a614f make/tools/src/build/tools/stripproperties/StripPropertiesCorba.java
--- 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
diff -r bbaef650c3d2 -r 9094cd4a614f make/tools/strip_properties/Makefile
--- 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