residualvm/residualvm — pull request #634 by somaen (2012-07-06 13:42:38+00:00)
Title: RFC: Merge with ScummVM: e9261cbdd11082dcc46cd60dc60a92c9c10e987c

This is mostly a "Can we do it like this"-Pull Request. (It does break the theme, as it still needs a little updating).

I did the following:
git filter-branch on ScummVM to remove all the engines, unused codecs, documentation etc.
then I created a patch for every commit from the first point I saw we didn't have a merge.
finally I used git-am to apply those commits to the tree.

Some of the commits failed, and needed a bit of handling (not everything matches up in a few of the files, "ResidualVM not used" markers usually break the diff, which is good). And I had to do some manual amending in a few of them, BUT, I think I got most of it down, and it compiles and runs.

Some commits might still be partial though, but none of them lead to compile-errors atleast.

But, since I stripped the theme from ScummVM with filter-branch, those bits still need updating.

Merging like this allows us to keep history on the ScummVM-changes, and should ease merging around our local changes (since we would know WHAT changed upstream, and thus only have to rework the commit that crosses our changes).

Thoughts?