From: Leif D. <lde...@re...> - 2002-06-26 20:22:16
|
On Wed, 26 Jun 2002, Alan Hourihane wrote: > On Wed, Jun 26, 2002 at 07:44:14PM +0100, Jos=E9 Fonseca wrote: > > Alan, hint? (Or "How have you just done now with the s3virge branch?"= ) >=20 > cvs update -j HEAD >=20 > and resolve the conflicts by hand. OK, I can do that. I guess it'll be about the same difficulty as merging the branch changes into the trunk code. Jose, do you have anything else you want to commit before I tag the new branch? I'm going to update my mach64-0-0-4-branch tree and tag it to create the new mach64-0-0-5-branch= . =20 Then I'll merge in the trunk and start working on conflicts and the drmCommand changes. --=20 Leif Delgass=20 http://www.retinalburn.net |