[Scummvm-devel] RTL branch to be merged (relevant for *all* developers)

[peres]

> 2) Next, I will merge the changes of each engine separately. Well,
> with exception of the parallaction engine, for which the patch is
> broken right now, because peres keeps shifting things around quicker
> than we can adapt our patches :)
>

I'll take this as a compliment. Should I fix the main trunk or the RTL  
branch?