There was a very strange bzr error when trying to merge my recent work with Brian's with qtGui.p. Something about not being able to change history. The diffs between 4961 and 4960 made no sense at all. I'm not blaming Brian: it's likely a bzr problem.
I believe the trunk is now restored to what it should be, but I can't be absolutely sure. Please report any weirdness immediately. An emergency fix ----------------------- I created a new branch, and merged *all* my code into the branch by hand. Diffing 4962 with 4960 shows that the massive diffs in 4961 were undone in 4962, so that likely nothing bad has happened. Various diffs confirm that Brian's work remains in the trunk--it wasn't reverted. I'm going to recreate my trunk so I have a fresh starting point. Edward -- You received this message because you are subscribed to the Google Groups "leo-editor" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/leo-editor?hl=en.
