[Cosmo-dev] 0.6.1 -> trunk merge details

[Brian Moseley]

On 3/28/07, Matthew Eernisse <mde at osafoundation.org> wrote:
> Actually after building the app, it appears that the merge has
> overwritten the new button styling in the trunk with the older code from
> 0.6.1. Other bugfix changes changes I made seem to have been reverted as
> well.
>
> Was that supposed to happen?

definitely not. i'm not sure what happened, but at least one of
travis' checkins to the trunk was also reverted. so i suggest that
anybody who has committed anything to the trunk since the 0.6.1 branch
was spun should check to see if it got reverted.