changeset 774:510cac321745

Merge
author ddehaven
date Wed, 01 Jun 2016 15:27:49 -0700
parents 23008556601e dfc73c951df8
children 9023db9557bd
files
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Fri May 20 00:02:55 2016 -0700
+++ b/.hgtags	Wed Jun 01 15:27:49 2016 -0700
@@ -362,3 +362,4 @@
 7a1b36bf2fe55a9a7732489ccdd326c910329a7e jdk-9+117
 8c2c2d17f7ce92a31c9ccb44a122ec62f5a85ace jdk-9+118
 daf533920b1266603b5cbdab31908d2a931c5361 jdk-9+119
+5943b791e131e79b969d4cea053aecda34801723 jdk-9+120
--- a/LICENSE	Fri May 20 00:02:55 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.