X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=isamc%2Fmerge.c;h=35f19c0781b3e9c50bd70efadcbde87d0dc05afb;hp=072e5ae84a2e84291fbdbc2a3727aab0bf6e10a2;hb=11d386bdb7b6b4a9bba10da749a5770b509c1fbd;hpb=ecb3935e78cd9bcfdebafdee0834cfb1060d7b5e

diff --git a/isamc/merge.c b/isamc/merge.c
index 072e5ae..35f19c0 100644
--- a/isamc/merge.c
+++ b/isamc/merge.c
@@ -1,8 +1,5 @@
-/* $Id: merge.c,v 1.31 2006-05-10 08:13:27 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,11 +12,14 @@ 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
+
 */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdlib.h>
 #include <assert.h>
 #include <string.h>
@@ -482,6 +482,7 @@ void isamc_merge (ISAMC is, ISAM_P *ipos, ISAMC_I *data)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab