changeset 941:0ed304595de1

Merge
author ddehaven
date Wed, 01 Jun 2016 15:27:49 -0700
parents 6deb9f071fb3 c6fb5e78e1c1
children 3abcc11cbdd0
files
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Fri May 20 00:03:38 2016 -0700
+++ b/.hgtags	Wed Jun 01 15:27:49 2016 -0700
@@ -362,3 +362,4 @@
 46b57560cd06ebcdd21489250628ff5f9d9d8916 jdk-9+117
 a8aa25fc6c5fda0ed7a93b8ffee62da326a752fc jdk-9+118
 f92e8518bb34a9628b11e662bf7308561a55eb3b jdk-9+119
+ecbe72546137cd29cb73d4dcc81cc099e847d543 jdk-9+120
--- a/LICENSE	Fri May 20 00:03:38 2016 -0700
+++ b/LICENSE	Wed Jun 01 15:27:49 2016 -0700
@@ -3,7 +3,7 @@
 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 @@
     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.