[Koha-cvs] CVS: koha/marc koha2marc,1.4,1.5 test,1.1,1.2 viewmarc.pl,1.2,1.3

[Steve Tonnesen]

Update of /cvsroot/koha/koha/marc
In directory usw-pr-cvs1:/tmp/cvs-serv13891/marc

Modified Files:
	koha2marc test viewmarc.pl 
Log Message:
More merges in from rel-1-2
All of the changes so far have been minor.  I did uncomment delbiblio($biblio)
in delbiblio.pl in the main branch to match delbiblio.pl in rel-1-2


Index: koha2marc
===================================================================
RCS file: /cvsroot/koha/koha/marc/koha2marc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** koha2marc	6 Nov 2001 18:25:30 -0000	1.4
--- koha2marc	20 Jun 2002 17:33:17 -0000	1.5
***************
*** 14,17 ****
--- 14,18 ----
  #use strict;
  use C4::Acquisitions;
+ use C4::Biblio;
  use C4::Output;
  my $dbh=C4Connect;

Index: test
===================================================================
RCS file: /cvsroot/koha/koha/marc/test,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** test	6 Nov 2001 18:24:54 -0000	1.1
--- test	20 Jun 2002 17:33:17 -0000	1.2
***************
*** 9,12 ****
--- 9,13 ----
  #use strict;
  use C4::Acquisitions;
+ use C4::Biblio;
  use C4::Output;
  my $userid=$ENV{'REMOTE_USER'};

Index: viewmarc.pl
===================================================================
RCS file: /cvsroot/koha/koha/marc/viewmarc.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** viewmarc.pl	5 Oct 2001 21:23:22 -0000	1.2
--- viewmarc.pl	20 Jun 2002 17:33:17 -0000	1.3
***************
*** 13,16 ****
--- 13,17 ----
  use strict;
  use C4::Acquisitions;
+ use C4::Biblio;
  use C4::Output;