just merged the release branch back to the HEAD
Tag before merge SLIDE_HEAD_PRE_MERGE
Tag after merge SLIDE_HEAD_POST_MERGE
I tagged the release branch with: SLIDE_2_0_RELEASE_BRANCH_LAST_MERGE
All changes made there up to this tag are now included in the HEAD.
If you have no idea what all this means, it should not matter too much ;)
Happy conflict fixing ;)
Oliver
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
