[mplayerosx-devel] Merging OSX Extended

[Adrian Stutz]

Hello OSX List,

10 months and 10 revisions ago I started the MPlayer OSX Extended
branch, initially to add two options to the preferences but soon to
add features and to fix things where they nagged me.

I received various questions about merging my branch back to the main
one. Branching ever really was only a way for me to get to know the
project and to steadily advance on the way to keep my motivation.

I think now would be a good time to merge Extended back into the main
branch and I would like to get some feedback on this.

What would be the preferred way to undertake this merge? My SVN
history goes back to revision 5 but individual commits are quite big
at the beginning. Should I just merge Extended in one go or merge
individual releases?

On a separate note, the sourceforge project page of the original
MPlayer OSX project is confusing a lot of people. Does anybody have
access to the project to add a message that it's dead and been taken
over by mplayerhq.hu?

Greetings
Adrian