[koha-commits] main Koha release repository branch, master, updated. v3.02.00-beta-136-ga85bd68

[Git repo owner]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  a85bd68b8e33cbf4a7cd46fa90e2fdbfc909a846 (commit)
       via  07ae6c6cd629abd6befe095cb7c9e3540d07f8df (commit)
       via  947b47954eeffaafb2357933428983f084bc199f (commit)
       via  7ac26f73f41fe17acd896d09f76b5d146de25495 (commit)
      from  c19a56f9cd149bb6b1e587954edbdc3db969bdcf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a85bd68b8e33cbf4a7cd46fa90e2fdbfc909a846
Merge: 07ae6c6cd629abd6befe095cb7c9e3540d07f8df 7ac26f73f41fe17acd896d09f76b5d146de25495
Author: Galen Charlton <gmcharlt at gmail.com>
Date:   Wed Oct 6 07:11:02 2010 -0400

    Merge remote branch 'koha-fbc/k_bug_5247' into to-push
    
    Signed-off-by: Galen Charlton <gmcharlt at gmail.com>

commit 07ae6c6cd629abd6befe095cb7c9e3540d07f8df
Merge: c19a56f9cd149bb6b1e587954edbdc3db969bdcf 947b47954eeffaafb2357933428983f084bc199f
Author: Galen Charlton <gmcharlt at gmail.com>
Date:   Wed Oct 6 07:10:27 2010 -0400

    Merge remote branch 'koha-fbc/k_bug_5249' into to-push
    
    Signed-off-by: Galen Charlton <gmcharlt at gmail.com>

commit 947b47954eeffaafb2357933428983f084bc199f
Author: Chris Nighswonger <cnighswonger at foundations.edu>
Date:   Fri Sep 24 14:41:32 2010 -0400

    Bug 5249 - Guide boxes do not print when selected for a layout

commit 7ac26f73f41fe17acd896d09f76b5d146de25495
Author: Chris Nighswonger <cnighswonger at foundations.edu>
Date:   Fri Sep 24 10:48:24 2010 -0400

    Bug 5247 - Text does not wrap properly on labels
    
    The apparent fix is to have the text wrap alogrithm to calculate based
    on a label width reduced by approx. 3/16" when there is no left text margin.
    
    This is probably not the proper fix as it appears that this algorithm is being
    affected by adjustments in the label width for label creep and perhaps offset
    as well. But this does fix the symptom and is all the time available for this
    problem at present.
    
    Documentation Changes:
    
    It might be good to add a note to the effect that if the user does not supply
    a left text margin in the layout, a 3/16" (13.5 point) left text margin will
    apply by default.

-----------------------------------------------------------------------

Summary of changes:
 C4/Creators/Layout.pm      |    4 +---
 C4/Labels/Label.pm         |    4 ++++
 labels/label-create-pdf.pl |    3 +++
 3 files changed, 8 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
main Koha release repository