changeset 142:92e1d9bb0555

Merge from main OpenJDK repository
author Greg Lewis <glewis@eyesbeyond.com>
date Fri, 19 Feb 2010 08:02:15 -0800
parents cc4ccbd3934a 6c0ccabb430d
children e0606659c29d
files
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Feb 15 08:08:33 2010 -0800
+++ b/.hgtags	Fri Feb 19 08:02:15 2010 -0800
@@ -58,3 +58,4 @@
 204e59d488cdaa9eafa8cb7164ea955b5a9d4a51 jdk7-b81
 c876ad22e4bf9d3c6460080db7ace478e29a3ff9 jdk7-b82
 309a0a7fc6ceb1c9fc3a85b3608e97ef8f7b0dfd jdk7-b83
+32c0cf01d555747918529a6ff9e06b0090c7a474 jdk7-b84
--- a/jaxp.properties	Mon Feb 15 08:08:33 2010 -0800
+++ b/jaxp.properties	Fri Feb 19 08:02:15 2010 -0800
@@ -24,10 +24,10 @@
 #
 
 drops.master.copy.base=${drops.dir}
-drops.master.url.base=https://jaxp.dev.java.net/files/documents/913/144160
+drops.master.url.base=https://jaxp.dev.java.net/files/documents/913/147490
 
-jaxp_src.bundle.name=jdk7-jaxp-m5.zip
-jaxp_src.bundle.md5.checksum=8b58ce7919cda8e32a9afc5cb4b58bb1
+jaxp_src.bundle.name=jdk7-jaxp-m6.zip
+jaxp_src.bundle.md5.checksum=080827d779c114365f8504bd79b34604
 jaxp_src.master.bundle.dir=${drops.master.copy.base}
 jaxp_src.master.bundle.url.base=${drops.master.url.base}