X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=isamc%2Fmerge.c;h=35f19c0781b3e9c50bd70efadcbde87d0dc05afb;hp=b237dcf90711afca391e5bf2a86086045fc09d30;hb=85ad68ab178a261dc548284ee68aae9107cbfaaf;hpb=89d3a004b7c651fd5673abfc192e1472dc4d4197

diff --git a/isamc/merge.c b/isamc/merge.c
index b237dcf..35f19c0 100644
--- a/isamc/merge.c
+++ b/isamc/merge.c
@@ -1,8 +1,5 @@
-/* $Id: merge.c,v 1.33 2007-01-15 15:10:18 adam Exp $
-   Copyright (C) 1995-2007
-   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
@@ -20,6 +17,9 @@ 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