[Scummvm-devel] git force-push

Willem Jan Palenstijn wjp at usecode.org
Tue May 17 21:02:47 CEST 2011


On Tue, May 17, 2011 at 03:53:31PM +0200, Florian Kagerer wrote:
> Hi Willem Jan,
> 
> thanks for your attempt to clean this up. I am not going to try to do this
> myself for obvious reasons.
> I am rather clueless about the cause of the issue and with regard to
> possible solutions.
> I think all my commits made it into your branch. To avoid unnecessary
> regressions I'd prefer not to have particular commits deleted (if that's
> what the suggestion to 'squash together' commits is about). I don't mind if
> commit messages get modified.

I just pushed the commits.

The detune commits were squashed per Johannes' suggestion, and I squashed two
compilation fixes together with the commits that introduced them so that every
individual commit compiles.

I also changed the commit messages as Max suggested.

-Willem Jan




More information about the Scummvm-devel mailing list