X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=isamc%2Fmerge.c;h=38dc54fbd28cb12f08b904a04d22e29dd37757cc;hp=4fa46d49c29ecd071680b73e78fd8fc98d8bea1d;hb=a66b7d79383ae700f3358731eecfe2aafed0e90d;hpb=4478d785b7769691261005c98063b98a5a5971b3

diff --git a/isamc/merge.c b/isamc/merge.c
index 4fa46d4..38dc54f 100644
--- a/isamc/merge.c
+++ b/isamc/merge.c
@@ -1,8 +1,5 @@
-/* $Id: merge.c,v 1.32 2006-08-14 10:40:19 adam Exp $
-   Copyright (C) 1995-2006
-   Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) 1994-2010 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
@@ -482,6 +479,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