aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorasaha <none@none>2016-08-08 15:27:40 -0700
committerasaha <none@none>2016-08-08 15:27:40 -0700
commit1560cc4586a86f396ca786968bf5d042d2b0e53b (patch)
tree6adadc34a276703a6b75aee3a1e8cad06e70bae9
parent69be06abe3ba6a809dd229b491ffc2a6738e1f08 (diff)
parentee1778847d1c58f6767b4e73fc9c5868f0065453 (diff)
downloadjdk8u_jaxws-1560cc4586a86f396ca786968bf5d042d2b0e53b.tar.gz
Merge
-rw-r--r--.hgtags12
-rw-r--r--LICENSE6
2 files changed, 15 insertions, 3 deletions
diff --git a/.hgtags b/.hgtags
index e1e7396d..17fc880b 100644
--- a/.hgtags
+++ b/.hgtags
@@ -629,4 +629,16 @@ d3b054313ed2d29f9dbbdfd71a7ab3c4ad4eb5b6 jdk8u111-b00
a896244473b934376ae7b48a281a0401774c9074 jdk8u111-b02
d4b631c4844d23a30f11e37696e6f4ac1e9057dd jdk8u111-b03
9ba3b9700df8b4fc0f5b94b3930d4ba85be3b749 jdk8u111-b04
+452662a83e5bc6dc7e9425ddd10f6c8fc98d50d8 jdk8u111-b05
+cc2f9d823c77cf8f8442a2246edf00f66c2dda8a jdk8u111-b06
+23aa5ab8a2c882d467b8a86d587050de7d523604 jdk8u111-b07
+0a3caaf419ccbf819624f1d438c9fc834682821c jdk8u111-b08
+2d1c73175b3a5bd829503734e6eb65426bd12e16 jdk8u112-b00
+10388356386d4c6eaf63dc50a05b5a373b4dde98 jdk8u112-b01
+903e66791568904247b4181ebe3e05275788f02c jdk8u112-b02
+560d4d5c7a319e4b9316ef922c815307e32accf2 jdk8u112-b03
+da39da2c7a855575acf7bff86e5707c9aa723160 jdk8u112-b04
+454315c9ffd47f1abec15a51ff51f25c92d09254 jdk8u112-b06
+5f7c72e72f8ce44962a27ee24405c52348d1f38e jdk8u112-b07
+f3d512b7322957a8714f04f2d4714065ebca15f6 jdk8u112-b08
452662a83e5bc6dc7e9425ddd10f6c8fc98d50d8 jdk8u121-b00
diff --git a/LICENSE b/LICENSE
index b40a0f45..8b400c7a 100644
--- a/LICENSE
+++ b/LICENSE
@@ -3,7 +3,7 @@ The GNU General Public License (GPL)
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies of this license
document, but changing it is not allowed.
@@ -287,8 +287,8 @@ pointer to where the full notice is found.
more details.
You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc., 59
- Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Also add information on how to contact you by electronic and paper mail.