Merge
authorduke
Wed, 05 Jul 2017 22:20:26 +0200
changeset 41498 e65fc8dc6568
parent 41497 2770f176df66 (diff)
parent 41494 ef286bf2d5b0 (current diff)
child 41504 e2f120653dec
Merge
--- a/corba/.hgtags	Wed Jul 05 22:20:18 2017 +0200
+++ b/corba/.hgtags	Wed Jul 05 22:20:26 2017 +0200
@@ -382,3 +382,4 @@
 258cf18fa7fc59359b874f8743b7168dc48baf73 jdk-9+137
 27bb44be32076861a0951bcefb07a1d92509a4b6 jdk-9+138
 8c9da7fc5b07c606afd571c7012441b77dda83b2 jdk-9+139
+9f3fc931bc230f44f2a58d75f7f6360af98bb113 jdk-9+140
--- a/corba/make/gensrc/Gensrc-java.corba.gmk	Wed Jul 05 22:20:18 2017 +0200
+++ b/corba/make/gensrc/Gensrc-java.corba.gmk	Wed Jul 05 22:20:26 2017 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2016, 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