# HG changeset patch
# User lana
# Date 1351220736 25200
# Node ID a5c5a8f5b9e6bffd17a86d74c8f0a6d018e6879a
# Parent  4c4c096f95d1be5a1afbd882345fdc81a03ae9b9# Parent  d365a845f1cfb34f6b7697f12dca4694d3900867
Merge

diff -r 4c4c096f95d1 -r a5c5a8f5b9e6 corba/make/common/Defs-bsd.gmk
--- a/corba/make/common/Defs-bsd.gmk	Thu Oct 25 09:53:01 2012 -0700
+++ b/corba/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 4c4c096f95d1 -r a5c5a8f5b9e6 corba/make/common/internal/Resources.gmk
--- a/corba/make/common/internal/Resources.gmk	Thu Oct 25 09:53:01 2012 -0700
+++ b/corba/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 4c4c096f95d1 -r a5c5a8f5b9e6 corba/make/common/shared/Defs-bsd.gmk
--- a/corba/make/common/shared/Defs-bsd.gmk	Thu Oct 25 09:53:01 2012 -0700
+++ b/corba/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 4c4c096f95d1 -r a5c5a8f5b9e6 corba/make/common/shared/Defs-utils.gmk
--- a/corba/make/common/shared/Defs-utils.gmk	Thu Oct 25 09:53:01 2012 -0700
+++ b/corba/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 4c4c096f95d1 -r a5c5a8f5b9e6 corba/make/tools/src/build/tools/stripproperties/StripPropertiesCorba.java
--- a/corba/make/tools/src/build/tools/stripproperties/StripPropertiesCorba.java	Thu Oct 25 09:53:01 2012 -0700
+++ b/corba/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 4c4c096f95d1 -r a5c5a8f5b9e6 corba/make/tools/strip_properties/Makefile
--- a/corba/make/tools/strip_properties/Makefile	Thu Oct 25 09:53:01 2012 -0700
+++ b/corba/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