[Cosmo-dev] 0.6.1 -> trunk merge details

[Matthew Eernisse]

The binary files are all the button and dialog-box changes. I can make 
the changes manually when everyone's happy with what we have -- or Bear, 
you can do it if you want.

Let me know what y'all want me to do.

Thanks.


M.

These are removals:

cosmo/src/main/webapp/templates/default/images/button_center_lit.gif
cosmo/src/main/webapp/templates/default/images/button_left.gif
cosmo/src/main/webapp/templates/default/images/button_left_lit_sm.gif
cosmo/src/main/webapp/templates/default/images/button_right_dim.gif
cosmo/src/main/webapp/templates/default/images/button_center.gif
cosmo/src/main/webapp/templates/default/images/button_left_dim_sm.gif
cosmo/src/main/webapp/templates/default/images/button_left_dim.gif
cosmo/src/main/webapp/templates/default/images/button_right_lit_sm.gif
cosmo/src/main/webapp/templates/default/images/button_right_lit.gif
cosmo/src/main/webapp/templates/default/images/button_center_lit_sm.gif
cosmo/src/main/webapp/templates/default/images/button_left_sm.gif
cosmo/src/main/webapp/templates/default/images/button_left_lit.gif
cosmo/src/main/webapp/templates/default/images/button_right_dim_sm.gif
cosmo/src/main/webapp/templates/default/images/button_center_dim_sm.gif
cosmo/src/main/webapp/templates/default/images/button_center_dim.gif
cosmo/src/main/webapp/templates/default/images/button_right_sm.gif
cosmo/src/main/webapp/templates/default/images/button_right.gif
cosmo/src/main/webapp/templates/default/images/button_center_sm.gif

These need to be added:

cosmo/src/main/webapp/templates/default/images/drop_shadow_side_imgs.png
cosmo/src/main/webapp/templates/default/images/drop_shadow_bottom_imgs.png
cosmo/src/main/webapp/templates/default/images/button_bgs_sm.gif
cosmo/src/main/webapp/templates/default/images/button_bgs.gif



Mike Taylor wrote:
>> 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
> 
> 
> ------------------------------------------------------------------------
> 
> _______________________________________________
> cosmo-dev mailing list
> cosmo-dev at lists.osafoundation.org
> http://lists.osafoundation.org/mailman/listinfo/cosmo-dev