X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=isamc%2Fmerge.c;h=030b17e3da65eb349c52740cb9be53b4c7311c3d;hp=68fc2e56d95eefc295f693c14e8197de01ac633a;hb=a030c87bc444608639905eca95e29f84a4f1d991;hpb=ecf94fc25324414287d3bbfbeba4440e558edd17

diff --git a/isamc/merge.c b/isamc/merge.c
index 68fc2e5..030b17e 100644
--- a/isamc/merge.c
+++ b/isamc/merge.c
@@ -1,8 +1,5 @@
-/* $Id: merge.c,v 1.30 2005-04-13 13:03:48 adam Exp $
-   Copyright (C) 1995-2005
-   Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) 1994-2011 Index Data
 
 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
@@ -15,9 +12,9 @@ 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.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
 #include <stdlib.h>
@@ -479,3 +476,12 @@ void isamc_merge (ISAMC is, ISAM_P *ipos, ISAMC_I *data)
     *ipos = cat + firstpos * 8;
 }
 
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+