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/enh/bug_5917 has been updated
via c2b666eeb0878314916b8186f8fc63bfd9cfeffe (commit)
via 7a71d2c5e8f5a6685b0382217f83c98f850ef269 (commit)
via b9cee99da4fea934c617eadf3cfac62c380c717a (commit)
via 5f9bd8a01ec766695e313aa115231ea521cc2a82 (commit)
via 589aac15407d0ce4ef09ad01242299e35bed7765 (commit)
via 6ba6b2e148667d7fc1bd382d8f65c06e28768631 (commit)
from 77b6409802e6ce5612883ec6d22db9545547444a (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 c2b666eeb0878314916b8186f8fc63bfd9cfeffe
Author: Chris Cormack <chr...@catalyst.net.nz>
Date: Mon Mar 21 20:40:18 2011 +1300
Bug 5917 : Catching changes from bug 5065 to templates
commit 7a71d2c5e8f5a6685b0382217f83c98f850ef269
Merge: 77b6409802e6ce5612883ec6d22db9545547444a
b9cee99da4fea934c617eadf3cfac62c380c717a
Author: Chris Cormack <chr...@catalyst.net.nz>
Date: Mon Mar 21 20:39:05 2011 +1300
Merge remote branch 'kc/master' into new/enh/bug_5917
-----------------------------------------------------------------------
Summary of changes:
C4/ImportBatch.pm | 5 +-
acqui/basket.pl | 7 +-
acqui/neworderempty.pl | 38 ++-
koha-tmpl/intranet-tmpl/prog/en/js/acq.js | 7 +-
.../prog/en/modules/acqui/neworderempty.tmpl | 19 +-
.../prog/en/modules/tools/manage-marc-import.tmpl | 14 +-
.../prog/en/modules/acqui/neworderempty.tt | 19 +-
.../prog/en/modules/tools/manage-marc-import.tt | 14 +-
misc/admin/koha-preferences | 324 ++++++++++++++++++++
misc/commit_biblios_file.pl | 2 +-
.../KohaTest/ImportBatch/BatchStageCommitRevert.pm | 2 +-
tools/manage-marc-import.pl | 18 +-
12 files changed, 438 insertions(+), 31 deletions(-)
create mode 100755 misc/admin/koha-preferences
hooks/post-receive
--
main Koha release repository
_______________________________________________
koha-commits mailing list
koha-commits@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-commits
