[koha-commits] main Koha release repository branch, new/merge_help, updated. v3.02.00-10-g8640007

[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, new/merge_help has been updated
       via  8640007ca030dc3800401c84e9d973de01be4b2f (commit)
       via  92de0f7eaf841c7bc3928c7da449cb87e361cc8e (commit)
      from  d15790d9c56dfc1dc3bf3d3cbde452c936aa530c (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 8640007ca030dc3800401c84e9d973de01be4b2f
Author: Galen Charlton <gmcharlt at gmail.com>
Date:   Sat Oct 30 01:13:23 2010 -0400

    tweak wording of merge target
    
    Since the merge functionality is for merging biblio
    records, not items, made the language more precise.
    
    Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 92de0f7eaf841c7bc3928c7da449cb87e361cc8e
Author: Nicole Engard <nengard at bywatersolutions.com>
Date:   Sat Oct 30 01:13:22 2010 -0400

    add missing help file for merging records
    
    Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 .../prog/en/modules/help/cataloguing/merge.tmpl    |   23 ++++++++++++++++++++
 .../prog/en/modules/virtualshelves/shelves.tmpl    |    4 +-
 2 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/merge.tmpl


hooks/post-receive
-- 
main Koha release repository