# HG changeset patch # User lana # Date 1382988165 25200 # Node ID 219e616a6a4ff87e3b395368e1348cc3c5534a33 # Parent a90e9efa426421b099052b804a22409f02c846d6# Parent 0bbccf77c23e566170b88b52c2cf28e5d31ce927 Merge diff -r a90e9efa4264 -r 219e616a6a4f .hgtags --- a/.hgtags Wed Oct 23 16:45:30 2013 +0100 +++ b/.hgtags Mon Oct 28 12:22:45 2013 -0700 @@ -234,3 +234,4 @@ 3d2b7ce93c5c2e3db748f29c3d29620a8b3b748a jdk8-b110 85c1c94e723582f9a1dd0251502c42b73d6deea7 jdk8-b111 43cec76d1d62587a07af07e2d9bec93aba2a506b jdk8-b112 +a259ff3e42d91da68f4d4f09d7eb9dc22bc024fc jdk8-b113 diff -r a90e9efa4264 -r 219e616a6a4f make/jprt.properties --- a/make/jprt.properties Wed Oct 23 16:45:30 2013 +0100 +++ b/make/jprt.properties Mon Oct 28 12:22:45 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}, \