[Scummvm-devel] merging GSoC engines

[Willem Jan Palenstijn]

On Thu, Oct 17, 2013 at 12:25:44PM +0000, Willem Jan Palenstijn wrote:
> Hi all,
> 
> Are there any remaining things blocking merges of the GSoC projects Avalanche
> and ZVision?
> 
> I think the issues that had to be resolved pre-merge are taken care of, so we
> can probably move to merging these two engines soon?


I've merged both of them.


-Willem Jan