changeset 3810:968305b802ee

Merge
author trims
date Sat, 23 Jul 2011 01:56:51 -0700
parents e6e7d76b2bd3 (diff) 341a57af9b0a (current diff)
children 8e5d4aa73a8c
files
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Fri Jul 15 15:35:50 2011 -0700
+++ b/.hgtags	Sat Jul 23 01:56:51 2011 -0700
@@ -172,3 +172,5 @@
 3aea9e9feb073f5500e031be6186666bcae89aa2 hs21-b11
 9ad1548c6b63d596c411afc35147ffd5254426d9 jdk7-b142
 9ad1548c6b63d596c411afc35147ffd5254426d9 hs21-b12
+c149193c768b8b7233da4c3a3fdc0756b975848e hs21-b13
+c149193c768b8b7233da4c3a3fdc0756b975848e jdk7-b143
--- a/.jcheck/conf	Fri Jul 15 15:35:50 2011 -0700
+++ b/.jcheck/conf	Sat Jul 23 01:56:51 2011 -0700
@@ -1,1 +1,1 @@
-project=jdk7
+project=jdk8