changeset 587:96562bf197f2

Merge
author lana
date Mon, 28 Oct 2013 12:26:22 -0700
parents 390e94b9a852 (current diff) 1b1e12117fe2 (diff)
children 1af33ab1bc58
files
diffstat 2 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Oct 24 13:43:02 2013 -0700
+++ b/.hgtags	Mon Oct 28 12:26:22 2013 -0700
@@ -234,3 +234,4 @@
 4c84c5b447b09aff27f3b72667ab3a5401e85968 jdk8-b110
 17ee0d3e97fdb412e48f14d87f504946a708f846 jdk8-b111
 c1f9158fbb9c2da50f6946fffd974e8236e08447 jdk8-b112
+0046d2278204b7eff76803fc4623cb48c7e6384d jdk8-b113
--- a/make/jprt.properties	Thu Oct 24 13:43:02 2013 -0700
+++ b/make/jprt.properties	Mon Oct 28 12:26:22 2013 -0700
@@ -33,9 +33,7 @@
 
 # Standard list of jprt build targets for this source tree
 jprt.build.targets=                                             \
-    solaris_sparc_5.10-{product|fastdebug},                     \
     solaris_sparcv9_5.10-{product|fastdebug},                   \
-    solaris_i586_5.10-{product|fastdebug},                      \
     solaris_x64_5.10-{product|fastdebug},                       \
     linux_i586_2.6-{product|fastdebug},                         \
     linux_x64_2.6-{product|fastdebug},                          \