# HG changeset patch
# User lana
# Date 1428626251 25200
# Node ID caa330b275f39282793466529f6864766b31d9fd
# Parent 8f68c20bf19e6da2fd851325c993ec712dbfe9b4# Parent 28ca8dfebab69f51760dd22969ffe38aa13bda19
Merge
diff -r 8f68c20bf19e -r caa330b275f3 src/java.corba/share/classes/javax/activity/package.html
--- a/src/java.corba/share/classes/javax/activity/package.html Thu Apr 09 06:40:12 2015 -0700
+++ b/src/java.corba/share/classes/javax/activity/package.html Thu Apr 09 17:37:31 2015 -0700
@@ -2,7 +2,7 @@
@@ -34,7 +33,7 @@
Provides methods for the input and output of value types, and contains
other updates to the org/omg/CORBA/portable package.
-
+
@since 1.3
@serial exclude
diff -r 8f68c20bf19e -r caa330b275f3 src/java.corba/share/classes/org/omg/CosNaming/NamingContextExtPackage/package.html
--- a/src/java.corba/share/classes/org/omg/CosNaming/NamingContextExtPackage/package.html Thu Apr 09 06:40:12 2015 -0700
+++ b/src/java.corba/share/classes/org/omg/CosNaming/NamingContextExtPackage/package.html Thu Apr 09 17:37:31 2015 -0700
@@ -3,7 +3,7 @@