[Scummvm-devel] Merging remaining GSoC branches (Attention PORTERS!)

John Willis John.Willis at Distant-earth.com
Tue Nov 2 13:04:07 CET 2010


> > Yotam, by all means, go ahead. I see you already merged changes back
into
> that branch. There is no point in waiting for the opengl branch first :).
> >
> 
> Working on it. Man how I dislike SVN's merge -- can't wait for the move to
> git.

Amen to that, just looking at merging in bits of the GL branch locally and
it's like pulling teeth :-o.

John






More information about the Scummvm-devel mailing list