changeset 322:107dc5816877

Merge
author asaha
date Thu, 27 Oct 2011 23:17:42 -0700
parents 9c540a9b0bdf (current diff) 91d818552c08 (diff)
children c0ca9fd3460d
files .hgtags
diffstat 2 files changed, 14 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Oct 26 12:43:06 2011 -0700
+++ b/.hgtags	Thu Oct 27 23:17:42 2011 -0700
@@ -121,10 +121,20 @@
 39bf6dcaab2336326b21743cef7042d0a2de9ba0 jdk7-b144
 10ca7570f47f2ae4132648f7e8da1a05f1a98a15 jdk7-b145
 bcd31fa1e3c6f51b4fdd427ef905188cdac57164 jdk7-b146
+067fb18071e3872698f6218724958bd0cebf30a3 jdk7u1-b01
 fc268cd1dd5d2e903ccd4b0275e1f9c2461ed30c jdk7-b147
+104ca42e1e7ca66b074a4619ce6420f15d8f454d jdk7u1-b02
+64e323faadf65018c1ffc8bb9c97f7b664e87347 jdk7u1-b03
+2256c20e66857f80cacda14ffdbc0979c929d7f8 jdk7u1-b04
+79ec2a8c8aaf015e888e8997abd4767d216b4037 jdk7u1-b05
 6c9ac74190a073bcee616a39f8fc5c6b2a501ce1 jdk7u2-b01
 4b0c44f2f7f13e4a44497d8d8cd8dcef5bb29d0b jdk7u2-b04
 06ec99824fc7473d1b73e3d0a37f7e046d9be5ca jdk7u2-b05
 5946b073c57a340cc566414cd50c954c044576e1 jdk7u2-b06
 323d917b683e94c1bdca51c31b257ec492a106a6 jdk7u2-b07
 db8ccf2cbb339005a5b90ec0ca825db43c130e20 jdk7u2-b08
+f2dcb5ade608d0d503f06f3748ef5be2ff1fe9a1 jdk7u2-b09
+38711a9aabde08547f9998233a21fd4b94879893 jdk7u1-b06
+5d8a5978b6ea914d715c8ab4e905a865225dd8a0 jdk7u1-b07
+407177580b012f89df837094b45287b7d250c911 jdk7u1-b08
+0c5c2b2462f104970eefa4a47b3c4428efd81cf0 jdk7u2-b11
--- a/jaxp.properties	Wed Oct 26 12:43:06 2011 -0700
+++ b/jaxp.properties	Thu Oct 27 23:17:42 2011 -0700
@@ -25,13 +25,13 @@
 
 drops.master.copy.base=${drops.dir}
 
-jaxp_src.bundle.name=jaxp145update1.zip
-jaxp_src.bundle.md5.checksum=f984f2c62894ce7f38d9d6f635140a56
+jaxp_src.bundle.name=jaxp145_01.zip
+jaxp_src.bundle.md5.checksum=32394c780c8fb5e29775f623525993c0
 jaxp_src.master.bundle.dir=${drops.master.copy.base}
 jaxp_src.master.bundle.url.base=http://download.java.net/jaxp/1.4.5
 
-jaxp_tests.bundle.name=jaxp145update1_unittests.zip
-jaxp_tests.bundle.md5.checksum=5e9ceab4130e84ceeec85d1de778313a
+jaxp_tests.bundle.name=jaxp-1_4_5-unittests.zip
+jaxp_tests.bundle.md5.checksum=fda9b9ad17c459880c077df6ecc7df80
 jaxp_tests.master.bundle.dir=${drops.master.copy.base}
 jaxp_tests.master.bundle.url.base=http://download.java.net/jaxp/1.4.5