Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz

diff --git a/win/LICENSE.txt b/win/LICENSE.txt
index 2f384a7..c932eba 100644 (file)
--- a/win/LICENSE.txt
+++ b/win/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 1995-2009, Index Data.
+Copyright (c) 1995-2010, Index Data.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/win/makefile b/win/makefile
index 63b9e50..1f26ef2 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -1,8 +1,5 @@
 # This file is part of the YAZ toolkit.
-# Copyright (C) 1995-2009 Index Data
-#
-# Programmed by
-#  Heikki Levanto & Adam Dickmeiss
+# Copyright (C) 1995-2010 Index Data
 
 # Parameters 
 

diff --git a/win/yaz.nsi b/win/yaz.nsi
index 14bd914..eb46efe 100644 (file)
--- a/win/yaz.nsi
+++ b/win/yaz.nsi
@@ -1,5 +1,5 @@
 ; This file is part of the YAZ toolkit.
-; Copyright (C) 1995-2009 Index Data
+; Copyright (C) 1995-2010 Index Data
 
 !include version.nsi
 
@@ -105,9 +105,9 @@ Noservice:
        File ..\bin\zlib1.dll
        File ..\bin\libxml2.dll
        File ..\bin\libxslt.dll
-       File ..\bin\yaz3.dll
+       File ..\bin\yaz4.dll
        File ..\bin\icu*.dll
-       File ..\bin\yaz_icu3.dll
+       File ..\bin\yaz_icu4.dll
        File ..\bin\*.exe
        SetOutPath $SMPROGRAMS\YAZ
        CreateShortCut "$SMPROGRAMS\YAZ\YAZ Client.lnk" \

diff --git a/win/yaz.rc b/win/yaz.rc
index 79a1d83..c03a1b5 100644 (file)
--- a/win/yaz.rc
+++ b/win/yaz.rc
@@ -27,7 +27,7 @@ VS_VERSION_INFO VERSIONINFO
 #endif
             VALUE "FileVersion", YAZ_VERSION "\0"
             VALUE "InternalName", "YAZ\0"
-            VALUE "LegalCopyright", "Copyright © 1995-2009 Index Data ApS\0"
+            VALUE "LegalCopyright", "Copyright © 1995-2010 Index Data\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "yaz.res\0"
             VALUE "PrivateBuild", "\0"