[Koha-cvs] CVS: koha/C4/Circulation Circ2.pm,1.21.2.12,1.21.2.13

[Steve Tonnesen]

Update of /cvsroot/koha/koha/C4/Circulation
In directory usw-pr-cvs1:/tmp/cvs-serv28289/C4/Circulation

Modified Files:
      Tag: rel-1-2
	Circ2.pm 
Log Message:
Merging files from trunk and rel-1-2, hoping to find some fixes to reserve
problems in the trunk code.  Didn't find any.  :(


Index: Circ2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.21.2.12
retrieving revision 1.21.2.13
diff -C2 -r1.21.2.12 -r1.21.2.13
*** Circ2.pm	24 Oct 2002 17:43:00 -0000	1.21.2.12
--- Circ2.pm	24 Oct 2002 18:20:29 -0000	1.21.2.13
***************
*** 1,4 ****
--- 1,6 ----
  package C4::Circulation::Circ2;
  
+ # $Id$
+ 
  #package to deal with Returns
  #written 3/11/99 by olwen at katipo.co.nz
***************
*** 30,34 ****
  #use C4::InterfaceCDK;
[...1853 lines suppressed...]
  	}
      }
***************
*** 1187,1189 ****
  }
  
! END { }       # module clean-up code here (global destructor)
--- 1853,1864 ----
  }
  
! 1;
! __END__
! 
! =back
! 
! =head1 AUTHOR
! 
! Koha Developement team <info at koha.org>
! 
! =cut