Bump year. Change Aps->ApS

[idzebra-moved-to-github.git] / isamc / merge.c

diff --git a/isamc/merge.c b/isamc/merge.c
index e8d9247..e0abc2f 100644 (file)
--- a/isamc/merge.c
+++ b/isamc/merge.c
@@ -1,6 +1,6 @@
-/* $Id: merge.c,v 1.27 2004-11-19 10:27:09 heikki Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
-   Index Data Aps
+/* $Id: merge.c,v 1.29 2005-01-15 19:38:31 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -24,7 +24,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <assert.h>
 #include <string.h>
 #include <stdio.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
 #include "isamc-p.h"
 
 struct isc_merge_block {