# HG changeset patch # User trims # Date 1311411411 25200 # Node ID 968305b802ee9223eef529864e7bc99701cccc13 # Parent e6e7d76b2bd31cecc019a1474debeeda8e21e2d1# Parent 341a57af9b0a6e6103d96966f95d309d09b53e75 Merge diff -r 341a57af9b0a -r 968305b802ee .hgtags --- 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 diff -r 341a57af9b0a -r 968305b802ee .jcheck/conf --- 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