X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=isamc%2Fmerge.c;h=794f7a32149f88fa166b7a7ff6e1a5a26e747c73;hb=38b8c213f9be6890ddba9d5564dc978c2ae2bc3d;hp=6da3de052940918510ae8bf360efeab2d01c7066;hpb=97a7adeb9e5059463f039495cc01cfa448463a27;p=idzebra-moved-to-github.git

diff --git a/isamc/merge.c b/isamc/merge.c
index 6da3de0..794f7a3 100644
--- a/isamc/merge.c
+++ b/isamc/merge.c
@@ -1,5 +1,5 @@
 /* This file is part of the Zebra server.
-   Copyright (C) 1995-2008 Index Data
+   Copyright (C) 1994-2009 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
@@ -479,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