# HG changeset patch
# User lana
# Date 1428626251 25200
# Node ID f51f8989ad5dc43b5c3f3dea01b659994dd8ab80
# Parent 5be4c26034282f2c63f3325a385d82fd25fd1d94# Parent f7e286240f8560517929e2fb20059bab48492a41
Merge
diff -r 5be4c2603428 -r f51f8989ad5d corba/src/java.corba/share/classes/javax/activity/package.html
--- a/corba/src/java.corba/share/classes/javax/activity/package.html Thu Apr 09 06:40:12 2015 -0700
+++ b/corba/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 5be4c2603428 -r f51f8989ad5d corba/src/java.corba/share/classes/org/omg/CosNaming/NamingContextExtPackage/package.html
--- a/corba/src/java.corba/share/classes/org/omg/CosNaming/NamingContextExtPackage/package.html Thu Apr 09 06:40:12 2015 -0700
+++ b/corba/src/java.corba/share/classes/org/omg/CosNaming/NamingContextExtPackage/package.html Thu Apr 09 17:37:31 2015 -0700
@@ -3,7 +3,7 @@