X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=isamc%2Fmerge.c;h=6da3de052940918510ae8bf360efeab2d01c7066;hb=0ef68e6e54cfd7a91a28ee3b1f305924ac34e787;hp=072e5ae84a2e84291fbdbc2a3727aab0bf6e10a2;hpb=ecb3935e78cd9bcfdebafdee0834cfb1060d7b5e;p=idzebra-moved-to-github.git diff --git a/isamc/merge.c b/isamc/merge.c index 072e5ae..6da3de0 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) 1995-2008 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