Merge
authoramurillo
Tue, 31 May 2016 09:41:15 -0700
changeset 38649 2feda5ea4b60
parent 38648 4e1ba08a4006 (current diff)
parent 38633 5bf5a1015a47 (diff)
child 38650 ce6dd277a80a
child 38735 cb658958508c
Merge
--- a/hotspot/LICENSE	Thu May 26 14:17:03 2016 -0700
+++ b/hotspot/LICENSE	Tue May 31 09:41:15 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.