Merge
authorjwilhelm
Thu, 16 Mar 2017 12:09:14 -0700
changeset 44245 6191bb6ebcbd
parent 44244 b3d8e72320cc (current diff)
parent 44204 8490172c1777 (diff)
child 44246 a53ca2520646
child 44313 469d367e27ee
child 44325 adbcb44aa685
Merge
hotspot/README
--- a/hotspot/.hgtags	Sat Mar 11 23:23:06 2017 -0800
+++ b/hotspot/.hgtags	Thu Mar 16 12:09:14 2017 -0700
@@ -563,3 +563,4 @@
 4e78f30935229f13ce7c43089621cf7169f5abac jdk-9+158
 9211c2e89c1cd11ec2d5752b0f97131a7d7525c7 jdk-9+159
 94b4e2e5331d38eab6a3639c3511b2e0715df0e9 jdk-9+160
+191ffbdb3d7b734288daa7fb76b37a0a85dfe7eb jdk-9+161
--- a/hotspot/README	Sat Mar 11 23:23:06 2017 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-README:
-  This file should be located at the top of the hotspot Mercurial repository.
-
-  See http://openjdk.java.net/ for more information about the OpenJDK.
-
-  See ../README-builds.html for complete details on build machine requirements.
-
-Simple Build Instructions:
-
-    cd make && gnumake
-     
-  The files that will be imported into the jdk build will be in the "build"
-  directory.
-