X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=isamc%2Fmerge.c;h=09006846ca21b9d1a8e600c6c0d3c167fbb8e573;hp=30921293adccb417ce2c99c1e13e4e7abce0a351;hb=896c0427df9d8eff5de6a1735dcd992e067df844;hpb=8f7e8952ccd2eca24d2bb91a79d2f17f346c490c

diff --git a/isamc/merge.c b/isamc/merge.c
index 3092129..0900684 100644
--- a/isamc/merge.c
+++ b/isamc/merge.c
@@ -1,9 +1,26 @@
-/*
- * Copyright (c) 1996-1998, Index Data.
- * See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss, Heikki Levanto
- *
- */
+/* $Id: merge.c,v 1.21 2002-08-02 19:26:56 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+   Index Data Aps
+
+This file is part of the Zebra server.
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Zebra; see the file LICENSE.zebra.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+*/
+
+
 
 #include <stdlib.h>
 #include <assert.h>
@@ -463,7 +480,10 @@ ISAMC_P isc_merge (ISAMC is, ISAMC_P ipos, ISAMC_I data)
 
 /*
  * $Log: merge.c,v $
- * Revision 1.20  1999-11-30 13:48:04  adam
+ * Revision 1.21  2002-08-02 19:26:56  adam
+ * Towards GPL
+ *
+ * Revision 1.20  1999/11/30 13:48:04  adam
  * Improved installation. Updated for inclusion of YAZ header files.
  *
  * Revision 1.19  1999/07/14 12:12:07  heikki