[Gramps-devel] SOUR_REPO merged with main trunk

The SOUR_REPO branch has been merged with the HEAD.
The HEAD is currently broken because of the event ref changes,
but the repo part seems to be more or less OK.
There were conflicts only in gramps.glade, which I managed
to resolve. There's no reason to use the SOUR_REPO branch
anymore. The rest of the development should go into HEAD.
--=20
Alexander Roitman http://www.gramps-project.org

Thread view

The SOUR_REPO branch has been merged with the HEAD.
The HEAD is currently broken because of the event ref changes,
but the repo part seems to be more or less OK.
There were conflicts only in gramps.glade, which I managed
to resolve. There's no reason to use the SOUR_REPO branch
anymore. The rest of the development should go into HEAD.
--=20
Alexander Roitman http://www.gramps-project.org

Thanks Alex
Glad it went in OK.
Richard
On Friday 27 May 2005 18:47, Alex Roitman wrote:
> The SOUR_REPO branch has been merged with the HEAD.
> The HEAD is currently broken because of the event ref changes,
> but the repo part seems to be more or less OK.
>
> There were conflicts only in gramps.glade, which I managed
> to resolve. There's no reason to use the SOUR_REPO branch
> anymore. The rest of the development should go into HEAD.
--
You can normally find me on Jabber as RichardTaylor@...