Two heads

[Mike Duigou]

Now corrected. I merged but failed to push.

Mike

On Sep 14 2012, at 03:36 , Paul Sandoz wrote:

> Hi,
> 
> We have two heads in the default branch:
> 
> jdk $ hg heads
> changeset:   6010:257bb5320a2b
> tag:         tip
> user:        mduigou
> date:        Thu Sep 13 21:40:37 2012 -0700
> summary:     javadoc and minor generics
> 
> changeset:   6008:5e95936891d2
> user:        Robert Field <Robert.Field at oracle.com>
> date:        Thu Sep 13 19:27:22 2012 -0700
> summary:     Update DefaultMethodAdd/RemoveTests, add shapes,
> 
> 
> 
> 
> Can someone bash this hydra on the head and do a merge?
> 
> Paul.
>