# HG changeset patch
# User duke
# Date 1499265868 -7200
# Node ID d206dbbc1d99b374cf7a899bf81699fbea15d358
# Parent  fc350fcb122a195ff0eaa8a29829be713c217149# Parent  9acfad455678ef80aeaba444980136621c95f533
Merge

diff -r 9acfad455678 -r d206dbbc1d99 corba/.hgtags
--- a/corba/.hgtags	Wed Jul 05 16:44:26 2017 +0200
+++ b/corba/.hgtags	Wed Jul 05 16:44:28 2017 +0200
@@ -15,3 +15,4 @@
 08be802754b0296c91a7713b6d85a015dbcd5349 jdk7-b38
 55078b6661e286e90387d1d9950bd865f5cc436e jdk7-b39
 184e21992f47a8d730df1adc5b21a108f3125489 jdk7-b40
+c90eeda9594ed2983403e2049aed8d503126c62e jdk7-b41
diff -r 9acfad455678 -r d206dbbc1d99 corba/make/common/Defs-windows.gmk
--- a/corba/make/common/Defs-windows.gmk	Wed Jul 05 16:44:26 2017 +0200
+++ b/corba/make/common/Defs-windows.gmk	Wed Jul 05 16:44:28 2017 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 1999-2008 Sun Microsystems, Inc.  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 9acfad455678 -r d206dbbc1d99 corba/make/common/shared/Compiler-msvc.gmk
--- a/corba/make/common/shared/Compiler-msvc.gmk	Wed Jul 05 16:44:26 2017 +0200
+++ b/corba/make/common/shared/Compiler-msvc.gmk	Wed Jul 05 16:44:28 2017 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 2005-2008 Sun Microsystems, Inc.  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