changeset 273:43a781cc6473

Merge
author xdono
date Thu, 07 May 2009 10:32:58 -0700
parents f3d27f02683c 8a2424db1a14
children 846944dd48a4
files
diffstat 2 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed May 06 18:04:08 2009 +0100
+++ b/.hgtags	Thu May 07 10:32:58 2009 -0700
@@ -30,3 +30,5 @@
 dbdeb4a7581b2a8699644b91cae6793cb01953f7 jdk7-b53
 197a7f881937d406a01214aa9ded49c073f7d380 jdk7-b54
 7394a8694cedea574c7dbd38de87f4cbe0e27b8a jdk7-b55
+825f23a4f262eb06cfc94406140f3bfecb17ffe8 jdk7-b56
+4030cc469205bbd517ca629fb170afb81760bbc5 jdk7-b57
--- a/make/jprt.properties	Wed May 06 18:04:08 2009 +0100
+++ b/make/jprt.properties	Thu May 07 10:32:58 2009 -0700
@@ -32,13 +32,13 @@
 solaris_sparcv9_5.10,\
 solaris_i586_5.10,\
 solaris_x64_5.10,\
-linux_i586,\
-linux_x64,\
+linux_i586_2.6,\
+linux_x64_2.6,\
 windows_i586,\
 windows_x64
 
 # The different build flavors we want
-jprt.build.flavors=product
+jprt.build.flavors=product,fastdebug
 
 # Explicitly designate what the 32bit match is for the 64bit build
 jprt.solaris_sparcv9.build.platform.match32=solaris_sparc_5.10