[Cosmo-dev] 0.6.1 -> trunk merge details

[Mike Taylor]

> I think we're in a situation where the fewer hands are involved in
> fixing this, the better.   Bear is willing to take a look and help
> untangle the tree, so I'd suggest that we let him take a crack at it.

I have created a patch file that contains all of the changes that 
happened on the trunk from r 3653 to r3934

I checked in the patch files as parts of the diff did not apply cleanly.

diff_from_3653.patch		this is the whole file - for reference ony
clean.patch				parts of the diff that will cleanly apply
failed.patch				parts of the diff that will fail when applied
already_applied.patch		parts of the diff that were already present
binaryfiles.patch			a list of image files that will need to be moved 
forward manually

I have not applied any of this to the trunk.  All of the above I 
checked into the trunk root directory

---
Bear

Build and Release Engineer
Open Source Applications Foundation (OSAF)
bear at osafoundation.orgr
http://www.osafoundation.org

bear at code-bear.com
http://code-bear.com

PGP Fingerprint = 9996 719F 973D B11B E111  D770 9331 E822 40B3 CD29

-------------- next part --------------
A non-text attachment was scrubbed...
Name: PGP.sig
Type: application/pgp-signature
Size: 186 bytes
Desc: This is a digitally signed message part
Url : http://lists.osafoundation.org/pipermail/cosmo-dev/attachments/20070329/b75f7037/PGP.pgp