This commit was manufactured by cvs2svn to create tag 'REL-07_03_0260'.REL-07_03_0260

9 files changed, 0 insertions, 1099 deletions

diff --git a/installer/Make.bat b/installer/Make.bat
deleted file mode 100644
index c025cd9..0000000
--- a/installer/Make.bat
+++ /dev/null
@@ -1,41 +0,0 @@
-@echo off

-

-if NOT "%1"=="" SET VERSION="%1"

-if NOT "%1"=="" GOTO GOT_VERSION

-

-SET VERSION="07.03.0260"

-

-echo.

-echo Version not specified - defaulting to %VERSION%

-echo.

-

-:GOT_VERSION

-

-echo.

-echo Building psqlODBC+ merge module...

-

-candle -nologo -dVERSION=%VERSION% -dPROGRAMFILES="%ProgramFiles%" psqlodbcm.wxs

-IF ERRORLEVEL 1 GOTO ERR_HANDLER

-

-light -nologo -out psqlodbc.msm psqlodbcm.wixobj

-IF ERRORLEVEL 1 GOTO ERR_HANDLER

-

-echo.

-echo Building psqlODBC+ installer database...

-

-candle -nologo -dVERSION=%VERSION% -dPROGRAMFILES="%ProgramFiles%" psqlodbc.wxs

-IF ERRORLEVEL 1 GOTO ERR_HANDLER

-

-light -nologo psqlodbc.wixobj

-IF ERRORLEVEL 1 GOTO ERR_HANDLER

-

-echo.

-echo Done!

-GOTO EXIT

-

-:ERR_HANDLER

-echo.

-echo Aborting build!

-GOTO EXIT

-

-:EXIT

diff --git a/installer/README.txt b/installer/README.txt
deleted file mode 100644
index cfb2ec9..0000000
--- a/installer/README.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-This directory contains the psqlODBC installer for Windows. To build the

-installer, you will need a copy of WiX installed somewhere in your system

-path. The installer has been tested with WiX version 2.0.2419 only at the

-time writing. WiX may be downloaded from:

-

-  http://sourceforge.net/projects/wix/.

-

-In order to build the installer, first ensure that a suitable binary is in

-the $SRC\Release directory, then, from the $SRC\Installer directory run:

-

-C:\psqlODBC\Installer> make 08.00.0001

-

-The version number will default to a value set in the Make.bat batch file if

-not specified on the command line. 2 files will be built:

-

-psqlodbc.msm - A merge module for use in other projects.

-psqlodbc.msi - A Windows Installer package for standalone use.

diff --git a/installer/banner.bmp b/installer/banner.bmp
deleted file mode 100644
index 4845509..0000000
--- a/installer/banner.bmp
+++ /dev/null
diff --git a/installer/lgpl.rtf b/installer/lgpl.rtf
deleted file mode 100644
index 5d931f8..0000000
--- a/installer/lgpl.rtf
+++ /dev/null
@@ -1,526 +0,0 @@
-{\rtf1\ansi\ansicpg1252\uc1 \deff0\deflang1033\deflangfe1033{\fonttbl{\f0\froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f1\fswiss\fcharset0\fprq2{\*\panose 020b0604020202020204}Arial;}
-{\f2\fmodern\fcharset0\fprq1{\*\panose 02070309020205020404}Courier New;}{\f23\fmodern\fcharset128\fprq1{\*\panose 02020609040205080304}MS Mincho{\*\falt MS ??};}{\f28\fmodern\fcharset128\fprq1{\*\panose 02020609040205080304}@MS Mincho;}
-{\f35\froman\fcharset238\fprq2 Times New Roman CE;}{\f36\froman\fcharset204\fprq2 Times New Roman Cyr;}{\f38\froman\fcharset161\fprq2 Times New Roman Greek;}{\f39\froman\fcharset162\fprq2 Times New Roman Tur;}
-{\f40\froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\f41\froman\fcharset178\fprq2 Times New Roman (Arabic);}{\f42\froman\fcharset186\fprq2 Times New Roman Baltic;}{\f43\fswiss\fcharset238\fprq2 Arial CE;}{\f44\fswiss\fcharset204\fprq2 Arial Cyr;}
-{\f46\fswiss\fcharset161\fprq2 Arial Greek;}{\f47\fswiss\fcharset162\fprq2 Arial Tur;}{\f48\fswiss\fcharset177\fprq2 Arial (Hebrew);}{\f49\fswiss\fcharset178\fprq2 Arial (Arabic);}{\f50\fswiss\fcharset186\fprq2 Arial Baltic;}
-{\f51\fmodern\fcharset238\fprq1 Courier New CE;}{\f52\fmodern\fcharset204\fprq1 Courier New Cyr;}{\f54\fmodern\fcharset161\fprq1 Courier New Greek;}{\f55\fmodern\fcharset162\fprq1 Courier New Tur;}{\f56\fmodern\fcharset177\fprq1 Courier New (Hebrew);}
-{\f57\fmodern\fcharset178\fprq1 Courier New (Arabic);}{\f58\fmodern\fcharset186\fprq1 Courier New Baltic;}{\f221\fmodern\fcharset0\fprq1 MS Mincho Western{\*\falt MS ??};}{\f219\fmodern\fcharset238\fprq1 MS Mincho CE{\*\falt MS ??};}
-{\f220\fmodern\fcharset204\fprq1 MS Mincho Cyr{\*\falt MS ??};}{\f222\fmodern\fcharset161\fprq1 MS Mincho Greek{\*\falt MS ??};}{\f223\fmodern\fcharset162\fprq1 MS Mincho Tur{\*\falt MS ??};}
-{\f226\fmodern\fcharset186\fprq1 MS Mincho Baltic{\*\falt MS ??};}{\f261\fmodern\fcharset0\fprq1 @MS Mincho Western;}{\f259\fmodern\fcharset238\fprq1 @MS Mincho CE;}{\f260\fmodern\fcharset204\fprq1 @MS Mincho Cyr;}
-{\f262\fmodern\fcharset161\fprq1 @MS Mincho Greek;}{\f263\fmodern\fcharset162\fprq1 @MS Mincho Tur;}{\f266\fmodern\fcharset186\fprq1 @MS Mincho Baltic;}}{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;
-\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;
-\red192\green192\blue192;}{\stylesheet{\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs24\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 \snext0 Normal;}{\*\cs10 \additive Default Paragraph Font;}{
-\s15\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \f2\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 \sbasedon0 \snext15 Plain Text;}}{\info{\author Administrator}{\operator Administrator}
-{\creatim\yr2001\mo4\dy3\hr19\min37}{\revtim\yr2001\mo4\dy3\hr19\min44}{\version5}{\edmins1}{\nofpages10}{\nofwords3823}{\nofchars21794}{\*\company The Vale Housing Association}{\nofcharsws0}{\vern8269}}\paperw11906\paperh16838\margl1152\margr1152 
-\widowctrl\ftnbj\aenddoc\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\hyphcaps0\formshade\horzdoc\dgmargin\dghspace180\dgvspace180\dghorigin1701\dgvorigin1984\dghshow1\dgvshow1
-\jexpand\viewkind4\viewscale100\pgbrdrhead\pgbrdrfoot\splytwnine\ftnlytwnine\htmautsp\nolnhtadjtbl\useltbaln\alntblind\lytcalctblwd\lyttblrtgr\lnbrkrule \fet0\sectd \linex0\headery708\footery708\colsx708\endnhere\sectlinegrid360\sectdefaultcl 
-{\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang{\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang{\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang{\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang{\pntxta )}}{\*\pnseclvl5
-\pndec\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang
-{\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}\pard\plain \s15\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \f2\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {
-\fs16\loch\af1\hich\af1\dbch\af23 \tab \tab \hich\af1\dbch\af23\loch\f1   GNU LESSER GENERAL PUBLIC LICENSE
-\par \tab \tab \hich\af1\dbch\af23\loch\f1        Version 2.1, February 1999
-\par 
-\par \hich\af1\dbch\af23\loch\f1  Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-\par \hich\af1\dbch\af23\loch\f1      59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-\par \hich\af1\dbch\af23\loch\f1  Everyone is permitted to copy and distribute verbatim copies
-\par \hich\af1\dbch\af23\loch\f1  of this license document, but changing it is not allowed.
-\par 
-\par \hich\af1\dbch\af23\loch\f1 [This is the first released version of the Lesser GPL.  It also counts
-\par \hich\af1\dbch\af23\loch\f1  a\hich\af1\dbch\af23\loch\f1 s the successor of the GNU Library Public License, version 2, hence
-\par \hich\af1\dbch\af23\loch\f1  the version number 2.1.]
-\par 
-\par \tab \tab \tab \hich\af1\dbch\af23\loch\f1     Preamble
-\par 
-\par \hich\af1\dbch\af23\loch\f1   The licenses for most software are designed to take away your
-\par \hich\af1\dbch\af23\loch\f1 freedom to share and change it.  By contrast, the GNU General Public
-\par \hich\af1\dbch\af23\loch\f1 Licenses ar\hich\af1\dbch\af23\loch\f1 e intended to guarantee your freedom to share and change
-\par \hich\af1\dbch\af23\loch\f1 free software--to make sure the software is free for all its users.
-\par 
-\par \hich\af1\dbch\af23\loch\f1   This license, the Lesser General Public License, applies to some
-\par \hich\af1\dbch\af23\loch\f1 specially designated software packages--typically libraries--of\hich\af1\dbch\af23\loch\f1  the
-\par \hich\af1\dbch\af23\loch\f1 Free Software Foundation and other authors who decide to use it.  You
-\par \hich\af1\dbch\af23\loch\f1 can use it too, but we suggest you first think carefully about whether
-\par \hich\af1\dbch\af23\loch\f1 this license or the ordinary General Public License is the better
-\par \hich\af1\dbch\af23\loch\f1 strategy to use in any particular case, base\hich\af1\dbch\af23\loch\f1 d on the explanations below.
-\par 
-\par \hich\af1\dbch\af23\loch\f1   When we speak of free software, we are referring to freedom of use,
-\par \hich\af1\dbch\af23\loch\f1 not price.  Our General Public Licenses are designed to make sure that
-\par \hich\af1\dbch\af23\loch\f1 you have the freedom to distribute copies of free software (and charge
-\par \hich\af1\dbch\af23\loch\f1 for this servi\hich\af1\dbch\af23\loch\f1 ce if you wish); that you receive source code or can get
-\par \hich\af1\dbch\af23\loch\f1 it if you want it; that you can change the software and use pieces of
-\par \hich\af1\dbch\af23\loch\f1 it in new free programs; and that you are informed that you can do
-\par \hich\af1\dbch\af23\loch\f1 these things.
-\par 
-\par \hich\af1\dbch\af23\loch\f1   To protect your rights, we need to make restrictions that forbid
-\par \hich\af1\dbch\af23\loch\f1 distributors to deny you these rights or to ask you to surrender these
-\par \hich\af1\dbch\af23\loch\f1 rights.  These restrictions translate to certain responsibilities for
-\par \hich\af1\dbch\af23\loch\f1 you if you distribute copies of the library or i\hich\af1\dbch\af23\loch\f1 f you modify it.
-\par 
-\par \hich\af1\dbch\af23\loch\f1   For example, if you distribute copies of the library, whether gratis
-\par \hich\af1\dbch\af23\loch\f1 or for a fee, you must give the recipients all the rights that we gave
-\par \hich\af1\dbch\af23\loch\f1 you.  You must make sure that they, too, receive or can get the source
-\par \hich\af1\dbch\af23\loch\f1 code.  If you link other \hich\af1\dbch\af23\loch\f1 code with the library, you must provide
-\par \hich\af1\dbch\af23\loch\f1 complete object files to the recipients, so that they can relink them
-\par \hich\af1\dbch\af23\loch\f1 with the library after making changes to the library and recompiling
-\par \hich\af1\dbch\af23\loch\f1 it.  And you must show them these terms so they know their rights.
-\par 
-\par \hich\af1\dbch\af23\loch\f1   We prot\hich\af1\dbch\af23\loch\f1 ect your rights with a two-step method: (1) we copyright the
-\par \hich\af1\dbch\af23\loch\f1 library, and (2) we offer you this license, which gives you legal
-\par \hich\af1\dbch\af23\loch\f1 permission to copy, distribute and/or modify the library.
-\par 
-\par \hich\af1\dbch\af23\loch\f1   To protect each distributor, we want to make it very clear that
-\par \hich\af1\dbch\af23\loch\f1 ther\hich\af1\dbch\af23\loch\f1 e is no warranty for the free library.  Also, if the library is
-\par \hich\af1\dbch\af23\loch\f1 modified by someone else and passed on, the recipients should know
-\par \hich\af1\dbch\af23\loch\f1 that what they have is not the original version, so that the original
-\par \hich\af1\dbch\af23\loch\f1 author's reputation will not be affected by problems th\hich\af1\dbch\af23\loch\f1 at might be
-\par \hich\af1\dbch\af23\loch\f1 introduced by others.
-\par \page 
-\par \hich\af1\dbch\af23\loch\f1   Finally, software patents pose a constant threat to the existence of
-\par \hich\af1\dbch\af23\loch\f1 any free program.  We wish to make sure that a company cannot
-\par \hich\af1\dbch\af23\loch\f1 effectively restrict the users of a free program by obtaining a
-\par \hich\af1\dbch\af23\loch\f1 restrictive licens\hich\af1\dbch\af23\loch\f1 e from a patent holder.  Therefore, we insist that
-\par \hich\af1\dbch\af23\loch\f1 any patent license obtained for a version of the library must be
-\par \hich\af1\dbch\af23\loch\f1 consistent with the full freedom of use specified in this license.
-\par 
-\par \hich\af1\dbch\af23\loch\f1   Most GNU software, including some libraries, is covered by the
-\par \hich\af1\dbch\af23\loch\f1 ordinar\hich\af1\dbch\af23\loch\f1 y GNU General Public License.  This license, the GNU Lesser
-\par \hich\af1\dbch\af23\loch\f1 General Public License, applies to certain designated libraries, and
-\par \hich\af1\dbch\af23\loch\f1 is quite different from the ordinary General Public License.  We use
-\par \hich\af1\dbch\af23\loch\f1 this license for certain libraries in order to permit link\hich\af1\dbch\af23\loch\f1 ing those
-\par \hich\af1\dbch\af23\loch\f1 libraries into non-free programs.
-\par 
-\par \hich\af1\dbch\af23\loch\f1   When a program is linked with a library, whether statically or using
-\par \hich\af1\dbch\af23\loch\f1 a shared library, the combination of the two is legally speaking a
-\par \hich\af1\dbch\af23\loch\f1 combined work, a derivative of the original library.  The ordinary
-\par \hich\af1\dbch\af23\loch\f1 Genera\hich\af1\dbch\af23\loch\f1 l Public License therefore permits such linking only if the
-\par \hich\af1\dbch\af23\loch\f1 entire combination fits its criteria of freedom.  The Lesser General
-\par \hich\af1\dbch\af23\loch\f1 Public License permits more lax criteria for linking other code with
-\par \hich\af1\dbch\af23\loch\f1 the library.
-\par 
-\par \hich\af1\dbch\af23\loch\f1   We call this license the "Lesser" General \hich\af1\dbch\af23\loch\f1 Public License because it
-\par \hich\af1\dbch\af23\loch\f1 does Less to protect the user's freedom than the ordinary General
-\par \hich\af1\dbch\af23\loch\f1 Public License.  It also provides other free software developers Less
-\par \hich\af1\dbch\af23\loch\f1 of an advantage over competing non-free programs.  These disadvantages
-\par \hich\af1\dbch\af23\loch\f1 are the reason we use t\hich\af1\dbch\af23\loch\f1 he ordinary General Public License for many
-\par \hich\af1\dbch\af23\loch\f1 libraries.  However, the Lesser license provides advantages in certain
-\par \hich\af1\dbch\af23\loch\f1 special circumstances.
-\par 
-\par \hich\af1\dbch\af23\loch\f1   For example, on rare occasions, there may be a special need to
-\par \hich\af1\dbch\af23\loch\f1 encourage the widest possible use o\hich\af1\dbch\af23\loch\f1 f a certain library, so that it becomes
-\par \hich\af1\dbch\af23\loch\f1 a de-facto standard.  To achieve this, non-free programs must be
-\par \hich\af1\dbch\af23\loch\f1 allowed to use the library.  A more frequent case is that a free
-\par \hich\af1\dbch\af23\loch\f1 library does the same job as widely used non-free libraries.  In this
-\par \hich\af1\dbch\af23\loch\f1 case, there is l\hich\af1\dbch\af23\loch\f1 ittle to gain by limiting the free library to free
-\par \hich\af1\dbch\af23\loch\f1 software only, so we use the Lesser General Public License.
-\par 
-\par \hich\af1\dbch\af23\loch\f1   In other cases, permission to use a particular library in non-free
-\par \hich\af1\dbch\af23\loch\f1 programs enables a greater number of people to use a large body of
-\par \hich\af1\dbch\af23\loch\f1 free sof\hich\af1\dbch\af23\loch\f1 tware.  For example, permission to use the GNU C Library in
-\par \hich\af1\dbch\af23\loch\f1 non-free programs enables many more people to use the whole GNU
-\par \hich\af1\dbch\af23\loch\f1 operating system, as well as its variant, the GNU/Linux operating
-\par \hich\af1\dbch\af23\loch\f1 system.
-\par 
-\par \hich\af1\dbch\af23\loch\f1   Although the Lesser General Public License is Less prot\hich\af1\dbch\af23\loch\f1 ective of the
-\par \hich\af1\dbch\af23\loch\f1 users' freedom, it does ensure that the user of a program that is
-\par \hich\af1\dbch\af23\loch\f1 linked with the Library has the freedom and the wherewithal to run
-\par \hich\af1\dbch\af23\loch\f1 that program using a modified version of the Library.
-\par 
-\par \hich\af1\dbch\af23\loch\f1   The precise terms and conditions for copying, distri\hich\af1\dbch\af23\loch\f1 bution and
-\par \hich\af1\dbch\af23\loch\f1 modification follow.  Pay close attention to the difference between a
-\par \hich\af1\dbch\af23\loch\f1 "work based on the library" and a "work that uses the library".  The
-\par \hich\af1\dbch\af23\loch\f1 former contains code derived from the library, whereas the latter must
-\par \hich\af1\dbch\af23\loch\f1 be combined with the library in ord\hich\af1\dbch\af23\loch\f1 er to run.
-\par \page 
-\par \tab \tab \hich\af1\dbch\af23\loch\f1   GNU LESSER GENERAL PUBLIC LICENSE
-\par \hich\af1\dbch\af23\loch\f1    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-\par 
-\par \hich\af1\dbch\af23\loch\f1   0. This License Agreement applies to any software library or other
-\par \hich\af1\dbch\af23\loch\f1 program which contains a notice placed by the copyright holder or
-\par \hich\af1\dbch\af23\loch\f1 other authorized party saying it may be distributed under the terms of
-\par \hich\af1\dbch\af23\loch\f1 this Lesser General Public License (also called "this License").
-\par \hich\af1\dbch\af23\loch\f1 Each licensee is addressed as "you".
-\par 
-\par \hich\af1\dbch\af23\loch\f1   A "library" means a collection of software functions and/or data
-\par \hich\af1\dbch\af23\loch\f1 prepared so as \hich\af1\dbch\af23\loch\f1 to be conveniently linked with application programs
-\par \hich\af1\dbch\af23\loch\f1 (which use some of those functions and data) to form executables.
-\par 
-\par \hich\af1\dbch\af23\loch\f1   The "Library", below, refers to any such software library or work
-\par \hich\af1\dbch\af23\loch\f1 which has been distributed under these terms.  A "work based on the
-\par \hich\af1\dbch\af23\loch\f1 L\hich\af1\dbch\af23\loch\f1 ibrary" means either the Library or any derivative work under
-\par \hich\af1\dbch\af23\loch\f1 copyright law: that is to say, a work containing the Library or a
-\par \hich\af1\dbch\af23\loch\f1 portion of it, either verbatim or with modifications and/or translated
-\par \hich\af1\dbch\af23\loch\f1 straightforwardly into another language.  (Hereinafter, t\hich\af1\dbch\af23\loch\f1 ranslation is
-\par \hich\af1\dbch\af23\loch\f1 included without limitation in the term "modification".)
-\par 
-\par \hich\af1\dbch\af23\loch\f1   "Source code" for a work means the preferred form of the work for
-\par \hich\af1\dbch\af23\loch\f1 making modifications to it.  For a library, complete source code means
-\par \hich\af1\dbch\af23\loch\f1 all the source code for all modules it contai\hich\af1\dbch\af23\loch\f1 ns, plus any associated
-\par \hich\af1\dbch\af23\loch\f1 interface definition files, plus the scripts used to control compilation
-\par \hich\af1\dbch\af23\loch\f1 and installation of the library.
-\par 
-\par \hich\af1\dbch\af23\loch\f1   Activities other than copying, distribution and modification are not
-\par \hich\af1\dbch\af23\loch\f1 covered by this License; they are outside its scope.  \hich\af1\dbch\af23\loch\f1 The act of
-\par \hich\af1\dbch\af23\loch\f1 running a program using the Library is not restricted, and output from
-\par \hich\af1\dbch\af23\loch\f1 such a program is covered only if its contents constitute a work based
-\par \hich\af1\dbch\af23\loch\f1 on the Library (independent of the use of the Library in a tool for
-\par \hich\af1\dbch\af23\loch\f1 writing it).  Whether that is true depends on what the Library does
-\par \hich\af1\dbch\af23\loch\f1 and what the program that uses the Library does.
-\par \hich\af1\dbch\af23\loch\f1   
-\par \hich\af1\dbch\af23\loch\f1   1. You may copy and distribute verbatim copies of the Library's
-\par \hich\af1\dbch\af23\loch\f1 complete source code as you receive it, in any medium, provided that
-\par \hich\af1\dbch\af23\loch\f1 y\hich\af1\dbch\af23\loch\f1 ou conspicuously and appropriately publish on each copy an
-\par \hich\af1\dbch\af23\loch\f1 appropriate copyright notice and disclaimer of warranty; keep intact
-\par \hich\af1\dbch\af23\loch\f1 all the notices that refer to this License and to the absence of any
-\par \hich\af1\dbch\af23\loch\f1 warranty; and distribute a copy of this License along with \hich\af1\dbch\af23\loch\f1 the
-\par \hich\af1\dbch\af23\loch\f1 Library.
-\par 
-\par \hich\af1\dbch\af23\loch\f1   You may charge a fee for the physical act of transferring a copy,
-\par \hich\af1\dbch\af23\loch\f1 and you may at your option offer warranty protection in exchange for a
-\par \hich\af1\dbch\af23\loch\f1 fee.
-\par \page 
-\par \hich\af1\dbch\af23\loch\f1   2. You may modify your copy or copies of the Library or any portion
-\par \hich\af1\dbch\af23\loch\f1 of it, thus forming a work\hich\af1\dbch\af23\loch\f1  based on the Library, and copy and
-\par \hich\af1\dbch\af23\loch\f1 distribute such modifications or work under the terms of Section 1
-\par \hich\af1\dbch\af23\loch\f1 above, provided that you also meet all of these conditions:
-\par 
-\par \hich\af1\dbch\af23\loch\f1     a) The modified work must itself be a software library.
-\par 
-\par \hich\af1\dbch\af23\loch\f1     b) You must cause the files\hich\af1\dbch\af23\loch\f1  modified to carry prominent notices
-\par \hich\af1\dbch\af23\loch\f1     stating that you changed the files and the date of any change.
-\par 
-\par \hich\af1\dbch\af23\loch\f1     c) You must cause the whole of the work to be licensed at no
-\par \hich\af1\dbch\af23\loch\f1     charge to all third parties under the terms of this License.
-\par 
-\par \hich\af1\dbch\af23\loch\f1     d) If a facility\hich\af1\dbch\af23\loch\f1  in the modified Library refers to a function or a
-\par \hich\af1\dbch\af23\loch\f1     table of data to be supplied by an application program that uses
-\par \hich\af1\dbch\af23\loch\f1     the facility, other than as an argument passed when the facility
-\par \hich\af1\dbch\af23\loch\f1     is invoked, then you must make a good faith effort to ensure that,
-\par \hich\af1\dbch\af23\loch\f1     in the event an application does not supply such function or
-\par \hich\af1\dbch\af23\loch\f1     table, the facility still operates, and performs whatever part of
-\par \hich\af1\dbch\af23\loch\f1     its purpose remains meaningful.
-\par 
-\par \hich\af1\dbch\af23\loch\f1     (For exam\hich\af1\dbch\af23\loch\f1 ple, a function in a library to compute square roots has
-\par \hich\af1\dbch\af23\loch\f1     a purpose that is entirely well-defined independent of the
-\par \hich\af1\dbch\af23\loch\f1     application.  Therefore, Subsection 2d requires that any
-\par \hich\af1\dbch\af23\loch\f1     application-supplied function or table used by this function must
-\par \hich\af1\dbch\af23\loch\f1     b\hich\af1\dbch\af23\loch\f1 e optional: if the application does not supply it, the square
-\par \hich\af1\dbch\af23\loch\f1     root function must still compute square roots.)
-\par 
-\par \hich\af1\dbch\af23\loch\f1 These requirements apply to the modified work as a whole.  If
-\par \hich\af1\dbch\af23\loch\f1 identifiable sections of that work are not derived from the Library,
-\par \hich\af1\dbch\af23\loch\f1 and can be\hich\af1\dbch\af23\loch\f1  reasonably considered independent and separate works in
-\par \hich\af1\dbch\af23\loch\f1 themselves, then this License, and its terms, do not apply to those
-\par \hich\af1\dbch\af23\loch\f1 sections when you distribute them as separate works.  But when you
-\par \hich\af1\dbch\af23\loch\f1 distribute the same sections as part of a whole which is a work \hich\af1\dbch\af23\loch\f1 based
-\par \hich\af1\dbch\af23\loch\f1 on the Library, the distribution of the whole must be on the terms of
-\par \hich\af1\dbch\af23\loch\f1 this License, whose permissions for other licensees extend to the
-\par \hich\af1\dbch\af23\loch\f1 entire whole, and thus to each and every part regardless of who wrote
-\par \hich\af1\dbch\af23\loch\f1 it.
-\par 
-\par \hich\af1\dbch\af23\loch\f1 Thus, it is not the intent of this sect\hich\af1\dbch\af23\loch\f1 ion to claim rights or contest
-\par \hich\af1\dbch\af23\loch\f1 your rights to work written entirely by you; rather, the intent is to
-\par \hich\af1\dbch\af23\loch\f1 exercise the right to control the distribution of derivative or
-\par \hich\af1\dbch\af23\loch\f1 collective works based on the Library.
-\par 
-\par \hich\af1\dbch\af23\loch\f1 In addition, mere aggregation of another work not based on the Library
-\par \hich\af1\dbch\af23\loch\f1 with the Library (or with a work based on the Library) on a volume of
-\par \hich\af1\dbch\af23\loch\f1 a storage or distribution medium does not bring the other work under
-\par \hich\af1\dbch\af23\loch\f1 the scope of this License.
-\par 
-\par \hich\af1\dbch\af23\loch\f1   3. You may opt t\hich\af1\dbch\af23\loch\f1 o apply the terms of the ordinary GNU General Public
-\par \hich\af1\dbch\af23\loch\f1 License instead of this License to a given copy of the Library.  To do
-\par \hich\af1\dbch\af23\loch\f1 this, you must alter all the notices that refer to this License, so
-\par \hich\af1\dbch\af23\loch\f1 that they refer to the ordinary GNU General Public License, vers\hich\af1\dbch\af23\loch\f1 ion 2,
-\par \hich\af1\dbch\af23\loch\f1 instead of to this License.  (If a newer version than version 2 of the
-\par \hich\af1\dbch\af23\loch\f1 ordinary GNU General Public License has appeared, then you can specify
-\par \hich\af1\dbch\af23\loch\f1 that version instead if you wish.)  Do not make any other change in
-\par \hich\af1\dbch\af23\loch\f1 these notices.
-\par \page 
-\par \hich\af1\dbch\af23\loch\f1   Once this change is \hich\af1\dbch\af23\loch\f1 made in a given copy, it is irreversible for
-\par \hich\af1\dbch\af23\loch\f1 that copy, so the ordinary GNU General Public License applies to all
-\par \hich\af1\dbch\af23\loch\f1 subsequent copies and derivative works made from that copy.
-\par 
-\par \hich\af1\dbch\af23\loch\f1   This option is useful when you wish to copy part of the code of
-\par \hich\af1\dbch\af23\loch\f1 the Library int\hich\af1\dbch\af23\loch\f1 o a program that is not a library.
-\par 
-\par \hich\af1\dbch\af23\loch\f1   4. You may copy and distribute the Library (or a portion or
-\par \hich\af1\dbch\af23\loch\f1 derivative of it, under Section 2) in object code or executable form
-\par \hich\af1\dbch\af23\loch\f1 under the terms of Sections 1 and 2 above provided that you accompany
-\par \hich\af1\dbch\af23\loch\f1 it with the complet\hich\af1\dbch\af23\loch\f1 e corresponding machine-readable source code, which
-\par \hich\af1\dbch\af23\loch\f1 must be distributed under the terms of Sections 1 and 2 above on a
-\par \hich\af1\dbch\af23\loch\f1 medium customarily used for software interchange.
-\par 
-\par \hich\af1\dbch\af23\loch\f1   If distribution of object code is made by offering access to copy
-\par \hich\af1\dbch\af23\loch\f1 from a designated place, then offering equivalent access to copy the
-\par \hich\af1\dbch\af23\loch\f1 source code from the same place satisfies the requirement to
-\par \hich\af1\dbch\af23\loch\f1 distribute the source code, even though third parties are not
-\par \hich\af1\dbch\af23\loch\f1 compelled to copy the source along with the object code.
-\par 
-\par \hich\af1\dbch\af23\loch\f1   5. A\hich\af1\dbch\af23\loch\f1  program that contains no derivative of any portion of the
-\par \hich\af1\dbch\af23\loch\f1 Library, but is designed to work with the Library by being compiled or
-\par \hich\af1\dbch\af23\loch\f1 linked with it, is called a "work that uses the Library".  Such a
-\par \hich\af1\dbch\af23\loch\f1 work, in isolation, is not a derivative work of the Library,\hich\af1\dbch\af23\loch\f1  and
-\par \hich\af1\dbch\af23\loch\f1 therefore falls outside the scope of this License.
-\par 
-\par \hich\af1\dbch\af23\loch\f1   However, linking a "work that uses the Library" with the Library
-\par \hich\af1\dbch\af23\loch\f1 creates an executable that is a derivative of the Library (because it
-\par \hich\af1\dbch\af23\loch\f1 contains portions of the Library), rather than a "work that us\hich\af1\dbch\af23\loch\f1 es the
-\par \hich\af1\dbch\af23\loch\f1 library".  The executable is therefore covered by this License.
-\par \hich\af1\dbch\af23\loch\f1 Section 6 states terms for distribution of such executables.
-\par 
-\par \hich\af1\dbch\af23\loch\f1   When a "work that uses the Library" uses material from a header file
-\par \hich\af1\dbch\af23\loch\f1 that is part of the Library, the object code for the\hich\af1\dbch\af23\loch\f1  work may be a
-\par \hich\af1\dbch\af23\loch\f1 derivative work of the Library even though the source code is not.
-\par \hich\af1\dbch\af23\loch\f1 Whether this is true is especially significant if the work can be
-\par \hich\af1\dbch\af23\loch\f1 linked without the Library, or if the work is itself a library.  The
-\par \hich\af1\dbch\af23\loch\f1 threshold for this to be true is not pr\hich\af1\dbch\af23\loch\f1 ecisely defined by law.
-\par 
-\par \hich\af1\dbch\af23\loch\f1   If such an object file uses only numerical parameters, data
-\par \hich\af1\dbch\af23\loch\f1 structure layouts and accessors, and small macros and small inline
-\par \hich\af1\dbch\af23\loch\f1 functions (ten lines or less in length), then the use of the object
-\par \hich\af1\dbch\af23\loch\f1 file is unrestricted, regardless o\hich\af1\dbch\af23\loch\f1 f whether it is legally a derivative
-\par \hich\af1\dbch\af23\loch\f1 work.  (Executables containing this object code plus portions of the
-\par \hich\af1\dbch\af23\loch\f1 Library will still fall under Section 6.)
-\par 
-\par \hich\af1\dbch\af23\loch\f1   Otherwise, if the work is a derivative of the Library, you may
-\par \hich\af1\dbch\af23\loch\f1 distribute \hich\af1\dbch\af23\loch\f1 the object code for the work under the terms of Section 6.
-\par \hich\af1\dbch\af23\loch\f1 Any executables containing that work also fall under Section 6,
-\par \hich\af1\dbch\af23\loch\f1 whether or not they are linked directly with the Library itself.
-\par \page 
-\par \hich\af1\dbch\af23\loch\f1   6. As an exception to the Sections above, you may also combine o\hich\af1\dbch\af23\loch\f1 r
-\par \hich\af1\dbch\af23\loch\f1 link a "work that uses the Library" with the Library to produce a
-\par \hich\af1\dbch\af23\loch\f1 work containing portions of the Library, and distribute that work
-\par \hich\af1\dbch\af23\loch\f1 under terms of your choice, provided that the terms permit
-\par \hich\af1\dbch\af23\loch\f1 modification of the work for the customer's own use and reverse
-\par \hich\af1\dbch\af23\loch\f1 engineering for debugging such modifications.
-\par 
-\par \hich\af1\dbch\af23\loch\f1   You must give prominent notice with each copy of the work that the
-\par \hich\af1\dbch\af23\loch\f1 Library is used in it and that the Library and its use are covered by
-\par \hich\af1\dbch\af23\loch\f1 this License.  You must supply a copy of this License.  If the work
-\par \hich\af1\dbch\af23\loch\f1 d\hich\af1\dbch\af23\loch\f1 uring execution displays copyright notices, you must include the
-\par \hich\af1\dbch\af23\loch\f1 copyright notice for the Library among them, as well as a reference
-\par \hich\af1\dbch\af23\loch\f1 directing the user to the copy of this License.  Also, you must do one
-\par \hich\af1\dbch\af23\loch\f1 of these things:
-\par 
-\par \hich\af1\dbch\af23\loch\f1     a) Accompany the work with the\hich\af1\dbch\af23\loch\f1  complete corresponding
-\par \hich\af1\dbch\af23\loch\f1     machine-readable source code for the Library including whatever
-\par \hich\af1\dbch\af23\loch\f1     changes were used in the work (which must be distributed under
-\par \hich\af1\dbch\af23\loch\f1     Sections 1 and 2 above); and, if the work is an executable linked
-\par \hich\af1\dbch\af23\loch\f1     with the Library, with \hich\af1\dbch\af23\loch\f1 the complete machine-readable "work that
-\par \hich\af1\dbch\af23\loch\f1     uses the Library", as object code and/or source code, so that the
-\par \hich\af1\dbch\af23\loch\f1     user can modify the Library and then relink to produce a modified
-\par \hich\af1\dbch\af23\loch\f1     executable containing the modified Library.  (It is understood
-\par \hich\af1\dbch\af23\loch\f1     that the user who changes the contents of definitions files in the
-\par \hich\af1\dbch\af23\loch\f1     Library will not necessarily be able to recompile the application
-\par \hich\af1\dbch\af23\loch\f1     to use the modified definitions.)
-\par 
-\par \hich\af1\dbch\af23\loch\f1     b) Use a suitable shared library mechanism for linking with the
-\par \hich\af1\dbch\af23\loch\f1     Libr\hich\af1\dbch\af23\loch\f1 ary.  A suitable mechanism is one that (1) uses at run time a
-\par \hich\af1\dbch\af23\loch\f1     copy of the library already present on the user's computer system,
-\par \hich\af1\dbch\af23\loch\f1     rather than copying library functions into the executable, and (2)
-\par \hich\af1\dbch\af23\loch\f1     will operate properly with a modified version of\hich\af1\dbch\af23\loch\f1  the library, if
-\par \hich\af1\dbch\af23\loch\f1     the user installs one, as long as the modified version is
-\par \hich\af1\dbch\af23\loch\f1     interface-compatible with the version that the work was made with.
-\par 
-\par \hich\af1\dbch\af23\loch\f1     c) Accompany the work with a written offer, valid for at
-\par \hich\af1\dbch\af23\loch\f1     least three years, to give the same user\hich\af1\dbch\af23\loch\f1  the materials
-\par \hich\af1\dbch\af23\loch\f1     specified in Subsection 6a, above, for a charge no more
-\par \hich\af1\dbch\af23\loch\f1     than the cost of performing this distribution.
-\par 
-\par \hich\af1\dbch\af23\loch\f1     d) If distribution of the work is made by offering access to copy
-\par \hich\af1\dbch\af23\loch\f1     from a designated place, offer equivalent access to cop\hich\af1\dbch\af23\loch\f1 y the above
-\par \hich\af1\dbch\af23\loch\f1     specified materials from the same place.
-\par 
-\par \hich\af1\dbch\af23\loch\f1     e) Verify that the user has already received a copy of these
-\par \hich\af1\dbch\af23\loch\f1     materials or that you have already sent this user a copy.
-\par 
-\par \hich\af1\dbch\af23\loch\f1   For an executable, the required form of the "work that uses the
-\par \hich\af1\dbch\af23\loch\f1 Libr\hich\af1\dbch\af23\loch\f1 ary" must include any data and utility programs needed for
-\par \hich\af1\dbch\af23\loch\f1 reproducing the executable from it.  However, as a special exception,
-\par \hich\af1\dbch\af23\loch\f1 the materials to be distributed need not include anything that is
-\par \hich\af1\dbch\af23\loch\f1 normally distributed (in either source or binary form) with the major
-\par \hich\af1\dbch\af23\loch\f1 components (compiler, kernel, and so on) of the operating system on
-\par \hich\af1\dbch\af23\loch\f1 which the executable runs, unless that component itself accompanies
-\par \hich\af1\dbch\af23\loch\f1 the executable.
-\par 
-\par \hich\af1\dbch\af23\loch\f1   It may happen that this require\hich\af1\dbch\af23\loch\f1 ment contradicts the license
-\par \hich\af1\dbch\af23\loch\f1 restrictions of other proprietary libraries that do not normally
-\par \hich\af1\dbch\af23\loch\f1 accompany the operating system.  Such a contradiction means you cannot
-\par \hich\af1\dbch\af23\loch\f1 use both them and the Library together in an executable that you
-\par \hich\af1\dbch\af23\loch\f1 distribute.
-\par \page 
-\par \hich\af1\dbch\af23\loch\f1   7. You may\hich\af1\dbch\af23\loch\f1  place library facilities that are a work based on the
-\par \hich\af1\dbch\af23\loch\f1 Library side-by-side in a single library together with other library
-\par \hich\af1\dbch\af23\loch\f1 facilities not covered by this License, and distribute such a combined
-\par \hich\af1\dbch\af23\loch\f1 library, provided that the separate distribution of the work \hich\af1\dbch\af23\loch\f1 based on
-\par \hich\af1\dbch\af23\loch\f1 the Library and of the other library facilities is otherwise
-\par \hich\af1\dbch\af23\loch\f1 permitted, and provided that you do these two things:
-\par 
-\par \hich\af1\dbch\af23\loch\f1     a) Accompany the combined library with a copy of the same work
-\par \hich\af1\dbch\af23\loch\f1     based on the Library, uncombined with any other library
-\par \hich\af1\dbch\af23\loch\f1     \hich\af1\dbch\af23\loch\f1 facilities.  This must be distributed under the terms of the
-\par \hich\af1\dbch\af23\loch\f1     Sections above.
-\par 
-\par \hich\af1\dbch\af23\loch\f1     b) Give prominent notice with the combined library of the fact
-\par \hich\af1\dbch\af23\loch\f1     that part of it is a work based on the Library, and explaining
-\par \hich\af1\dbch\af23\loch\f1     where to find the accompanying uncom\hich\af1\dbch\af23\loch\f1 bined form of the same work.
-\par 
-\par \hich\af1\dbch\af23\loch\f1   8. You may not copy, modify, sublicense, link with, or distribute
-\par \hich\af1\dbch\af23\loch\f1 the Library except as expressly provided under this License.  Any
-\par \hich\af1\dbch\af23\loch\f1 attempt otherwise to copy, modify, sublicense, link with, or
-\par \hich\af1\dbch\af23\loch\f1 distribute the Library is void, and will automatically terminate your
-\par \hich\af1\dbch\af23\loch\f1 rights under this License.  However, parties who have received copies,
-\par \hich\af1\dbch\af23\loch\f1 or rights, from you under this License will not have their licenses
-\par \hich\af1\dbch\af23\loch\f1 terminated so long as such parties remain in fu\hich\af1\dbch\af23\loch\f1 ll compliance.
-\par 
-\par \hich\af1\dbch\af23\loch\f1   9. You are not required to accept this License, since you have not
-\par \hich\af1\dbch\af23\loch\f1 signed it.  However, nothing else grants you permission to modify or
-\par \hich\af1\dbch\af23\loch\f1 distribute the Library or its derivative works.  These actions are
-\par \hich\af1\dbch\af23\loch\f1 prohibited by law if you do not acc\hich\af1\dbch\af23\loch\f1 ept this License.  Therefore, by
-\par \hich\af1\dbch\af23\loch\f1 modifying or distributing the Library (or any work based on the
-\par \hich\af1\dbch\af23\loch\f1 Library), you indicate your acceptance of this License to do so, and
-\par \hich\af1\dbch\af23\loch\f1 all its terms and conditions for copying, distributing or modifying
-\par \hich\af1\dbch\af23\loch\f1 the Library or works b\hich\af1\dbch\af23\loch\f1 ased on it.
-\par 
-\par \hich\af1\dbch\af23\loch\f1   10. Each time you redistribute the Library (or any work based on the
-\par \hich\af1\dbch\af23\loch\f1 Library), the recipient automatically receives a license from the
-\par \hich\af1\dbch\af23\loch\f1 original licensor to copy, distribute, link with or modify the Library
-\par \hich\af1\dbch\af23\loch\f1 subject to these terms and conditio\hich\af1\dbch\af23\loch\f1 ns.  You may not impose any further
-\par \hich\af1\dbch\af23\loch\f1 restrictions on the recipients' exercise of the rights granted herein.
-\par \hich\af1\dbch\af23\loch\f1 You are not responsible for enforcing compliance by third parties with
-\par \hich\af1\dbch\af23\loch\f1 this License.
-\par \page 
-\par \hich\af1\dbch\af23\loch\f1   11. If, as a consequence of a court judgment or allegation o\hich\af1\dbch\af23\loch\f1 f patent
-\par \hich\af1\dbch\af23\loch\f1 infringement or for any other reason (not limited to patent issues),
-\par \hich\af1\dbch\af23\loch\f1 conditions are imposed on you (whether by court order, agreement or
-\par \hich\af1\dbch\af23\loch\f1 otherwise) that contradict the conditions of this License, they do not
-\par \hich\af1\dbch\af23\loch\f1 excuse you from the conditions of this \hich\af1\dbch\af23\loch\f1 License.  If you cannot
-\par \hich\af1\dbch\af23\loch\f1 distribute so as to satisfy simultaneously your obligations under this
-\par \hich\af1\dbch\af23\loch\f1 License and any other pertinent obligations, then as a consequence you
-\par \hich\af1\dbch\af23\loch\f1 may not distribute the Library at all.  For example, if a patent
-\par \hich\af1\dbch\af23\loch\f1 license would not permit royalty-free redistribution of the Library by
-\par \hich\af1\dbch\af23\loch\f1 all those who receive copies directly or indirectly through you, then
-\par \hich\af1\dbch\af23\loch\f1 the only way you could satisfy both it and this License would be to
-\par \hich\af1\dbch\af23\loch\f1 refrain entirely from distribution of the Libra\hich\af1\dbch\af23\loch\f1 ry.
-\par 
-\par \hich\af1\dbch\af23\loch\f1 If any portion of this section is held invalid or unenforceable under any
-\par \hich\af1\dbch\af23\loch\f1 particular circumstance, the balance of the section is intended to apply,
-\par \hich\af1\dbch\af23\loch\f1 and the section as a whole is intended to apply in other circumstances.
-\par 
-\par \hich\af1\dbch\af23\loch\f1 It is not the purpose of this \hich\af1\dbch\af23\loch\f1 section to induce you to infringe any
-\par \hich\af1\dbch\af23\loch\f1 patents or other property right claims or to contest validity of any
-\par \hich\af1\dbch\af23\loch\f1 such claims; this section has the sole purpose of protecting the
-\par \hich\af1\dbch\af23\loch\f1 integrity of the free software distribution system which is
-\par \hich\af1\dbch\af23\loch\f1 implemented by public li\hich\af1\dbch\af23\loch\f1 cense practices.  Many people have made
-\par \hich\af1\dbch\af23\loch\f1 generous contributions to the wide range of software distributed
-\par \hich\af1\dbch\af23\loch\f1 through that system in reliance on consistent application of that
-\par \hich\af1\dbch\af23\loch\f1 system; it is up to the author/donor to decide if he or she is willing
-\par \hich\af1\dbch\af23\loch\f1 to distribute \hich\af1\dbch\af23\loch\f1 software through any other system and a licensee cannot
-\par \hich\af1\dbch\af23\loch\f1 impose that choice.
-\par 
-\par \hich\af1\dbch\af23\loch\f1 This section is intended to make thoroughly clear what is believed to
-\par \hich\af1\dbch\af23\loch\f1 be a consequence of the rest of this License.
-\par 
-\par \hich\af1\dbch\af23\loch\f1   12. If the distribution and/or use of the Library is restric\hich\af1\dbch\af23\loch\f1 ted in
-\par \hich\af1\dbch\af23\loch\f1 certain countries either by patents or by copyrighted interfaces, the
-\par \hich\af1\dbch\af23\loch\f1 original copyright holder who places the Library under this License may add
-\par \hich\af1\dbch\af23\loch\f1 an explicit geographical distribution limitation excluding those countries,
-\par \hich\af1\dbch\af23\loch\f1 so that distribution is permitted only in or among countries not thus
-\par \hich\af1\dbch\af23\loch\f1 excluded.  In such case, this License incorporates the limitation as if
-\par \hich\af1\dbch\af23\loch\f1 written in the body of this License.
-\par 
-\par \hich\af1\dbch\af23\loch\f1   13. The Free Software Foundation may publish revised and/or new
-\par \hich\af1\dbch\af23\loch\f1 versions o\hich\af1\dbch\af23\loch\f1 f the Lesser General Public License from time to time.
-\par \hich\af1\dbch\af23\loch\f1 Such new versions will be similar in spirit to the present version,
-\par \hich\af1\dbch\af23\loch\f1 but may differ in detail to address new problems or concerns.
-\par 
-\par \hich\af1\dbch\af23\loch\f1 Each version is given a distinguishing version number.  If the Library
-\par \hich\af1\dbch\af23\loch\f1 specifies a version number of this License which applies to it and
-\par \hich\af1\dbch\af23\loch\f1 "any later version", you have the option of following the terms and
-\par \hich\af1\dbch\af23\loch\f1 conditions either of that version or of any later version published by
-\par \hich\af1\dbch\af23\loch\f1 the Free Software Foundation.  If the Library doe\hich\af1\dbch\af23\loch\f1 s not specify a
-\par \hich\af1\dbch\af23\loch\f1 license version number, you may choose any version ever published by
-\par \hich\af1\dbch\af23\loch\f1 the Free Software Foundation.
-\par \page 
-\par \hich\af1\dbch\af23\loch\f1   14. If you wish to incorporate parts of the Library into other free
-\par \hich\af1\dbch\af23\loch\f1 programs whose distribution conditions are incompatible with these,
-\par \hich\af1\dbch\af23\loch\f1 w\hich\af1\dbch\af23\loch\f1 rite to the author to ask for permission.  For software which is
-\par \hich\af1\dbch\af23\loch\f1 copyrighted by the Free Software Foundation, write to the Free
-\par \hich\af1\dbch\af23\loch\f1 Software Foundation; we sometimes make exceptions for this.  Our
-\par \hich\af1\dbch\af23\loch\f1 decision will be guided by the two goals of preserving the free\hich\af1\dbch\af23\loch\f1  status
-\par \hich\af1\dbch\af23\loch\f1 of all derivatives of our free software and of promoting the sharing
-\par \hich\af1\dbch\af23\loch\f1 and reuse of software generally.
-\par 
-\par \tab \tab \tab \hich\af1\dbch\af23\loch\f1     NO WARRANTY
-\par 
-\par \hich\af1\dbch\af23\loch\f1   15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-\par \hich\af1\dbch\af23\loch\f1 WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-\par \hich\af1\dbch\af23\loch\f1 EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-\par \hich\af1\dbch\af23\loch\f1 OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-\par \hich\af1\dbch\af23\loch\f1 KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NO\hich\af1\dbch\af23\loch\f1 T LIMITED TO, THE
-\par \hich\af1\dbch\af23\loch\f1 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-\par \hich\af1\dbch\af23\loch\f1 PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-\par \hich\af1\dbch\af23\loch\f1 LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-\par \hich\af1\dbch\af23\loch\f1 THE COST OF ALL NECESSARY SERVICING\hich\af1\dbch\af23\loch\f1 , REPAIR OR CORRECTION.
-\par 
-\par \hich\af1\dbch\af23\loch\f1   16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-\par \hich\af1\dbch\af23\loch\f1 WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-\par \hich\af1\dbch\af23\loch\f1 AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-\par \hich\af1\dbch\af23\loch\f1 FOR DAMAGES, INCLUDING AN\hich\af1\dbch\af23\loch\f1 Y GENERAL, SPECIAL, INCIDENTAL OR
-\par \hich\af1\dbch\af23\loch\f1 CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-\par \hich\af1\dbch\af23\loch\f1 LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-\par \hich\af1\dbch\af23\loch\f1 RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-\par \hich\af1\dbch\af23\loch\f1 FAILURE OF THE LIBR\hich\af1\dbch\af23\loch\f1 ARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-\par \hich\af1\dbch\af23\loch\f1 SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-\par \hich\af1\dbch\af23\loch\f1 DAMAGES.
-\par 
-\par \tab \tab \hich\af1\dbch\af23\loch\f1      END OF TERMS AND CONDITIONS
-\par \page 
-\par \hich\af1\dbch\af23\loch\f1            How to Apply These Terms to Your New Libraries
-\par 
-\par \hich\af1\dbch\af23\loch\f1   If you develop a new library\hich\af1\dbch\af23\loch\f1 , and you want it to be of the greatest
-\par \hich\af1\dbch\af23\loch\f1 possible use to the public, we recommend making it free software that
-\par \hich\af1\dbch\af23\loch\f1 everyone can redistribute and change.  You can do so by permitting
-\par \hich\af1\dbch\af23\loch\f1 redistribution under these terms (or, alternatively, under the terms of the
-\par \hich\af1\dbch\af23\loch\f1 ordinary General Public License).
-\par 
-\par \hich\af1\dbch\af23\loch\f1   To apply these terms, attach the following notices to the library.  It is
-\par \hich\af1\dbch\af23\loch\f1 safest to attach them to the start of each source file to most effectively
-\par \hich\af1\dbch\af23\loch\f1 convey the exclusion of warranty; and each file should have at least t\hich\af1\dbch\af23\loch\f1 he
-\par \hich\af1\dbch\af23\loch\f1 "copyright" line and a pointer to where the full notice is found.
-\par 
-\par \hich\af1\dbch\af23\loch\f1     <one line to give the library's name and a brief idea of what it does.>
-\par \hich\af1\dbch\af23\loch\f1     Copyright (C) <year>  <name of author>
-\par 
-\par \hich\af1\dbch\af23\loch\f1     This library is free software; you can redistribute it and/or
-\par \hich\af1\dbch\af23\loch\f1     modify it under the terms of the GNU Lesser General Public
-\par \hich\af1\dbch\af23\loch\f1     License as published by the Free Software Foundation; either
-\par \hich\af1\dbch\af23\loch\f1     version 2.1 of the License, or (at your option) any later version.
-\par 
-\par \hich\af1\dbch\af23\loch\f1     This library is distributed in the hope that it will\hich\af1\dbch\af23\loch\f1  be useful,
-\par \hich\af1\dbch\af23\loch\f1     but WITHOUT ANY WARRANTY; without even the implied warranty of
-\par \hich\af1\dbch\af23\loch\f1     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-\par \hich\af1\dbch\af23\loch\f1     Lesser General Public License for more details.
-\par 
-\par \hich\af1\dbch\af23\loch\f1     You should have received a copy of the GNU Lesser \hich\af1\dbch\af23\loch\f1 General Public
-\par \hich\af1\dbch\af23\loch\f1     License along with this library; if not, write to the Free Software
-\par \hich\af1\dbch\af23\loch\f1     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-\par 
-\par \hich\af1\dbch\af23\loch\f1 Also add information on how to contact you by electronic and paper mail.
-\par 
-\par \hich\af1\dbch\af23\loch\f1 You should also \hich\af1\dbch\af23\loch\f1 get your employer (if you work as a programmer) or your
-\par \hich\af1\dbch\af23\loch\f1 school, if any, to sign a "copyright disclaimer" for the library, if
-\par \hich\af1\dbch\af23\loch\f1 necessary.  Here is a sample; alter the names:
-\par 
-\par \hich\af1\dbch\af23\loch\f1   Yoyodyne, Inc., hereby disclaims all copyright interest in the
-\par \hich\af1\dbch\af23\loch\f1   library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-\par 
-\par \hich\af1\dbch\af23\loch\f1   <signature of Ty Coon>, 1 April 1990
-\par \hich\af1\dbch\af23\loch\f1   Ty Coon, President of Vice
-\par 
-\par \hich\af1\dbch\af23\loch\f1 That's all there is to it!
-\par 
-\par 
-\par 
-\par 
-\par }}
\ No newline at end of file
diff --git a/installer/new.bmp b/installer/new.bmp
deleted file mode 100644
index 27881df..0000000
--- a/installer/new.bmp
+++ /dev/null
diff --git a/installer/psqlodbc.wxs b/installer/psqlodbc.wxs
deleted file mode 100644
index 84b6e63..0000000
--- a/installer/psqlodbc.wxs
+++ /dev/null
@@ -1,436 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
-  
-<!-- Product details -->
-
-  <Product 
-    Manufacturer="PostgreSQL Global Development Group" 
-    Id="F0D11DB7-BC1A-47e5-99D3-9F1216446AF9" 
-    Name="psqlODBC+" 
-    Version="$(var.VERSION)" 
-    Language="1033">
-      
-<!-- Package details -->
-
-    <Package 
-      Id="6A9EBC37-AA01-4f0f-AB18-093B3CDE9158" 
-      Keywords="PostgreSQL, ODBC" 
-      Comments="PostgreSQL ODBC Driver (enhanced build)"
-      Manufacturer="PostgreSQL Global Development Group" 
-      InstallerVersion="110" 
-      Languages="1033" 
-      Compressed="yes" 
-      SummaryCodepage="1252" />
-        
-<!-- Directories -->
-
-    <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="ProgramFilesFolder" Name="PFiles">
-        <Directory Id="BASEDIR" Name="psqlODBC" LongName="psqlODBC+">
-          <Directory Id="BINDIR" Name="bin">
-            <Merge Id="psqlodbcm" DiskId="1" Language="1033" src="psqlodbc.msm" />
-          </Directory>
-        </Directory>
-      </Directory>
-    </Directory>
-        
-<!-- Features -->
-
-    <Feature Id="psqlodbc" Title="psqlODBC+" Level="1" Description="psqlODBC - The PostgreSQL ODBC Driver (enhanced build)" ConfigurableDirectory="BASEDIR" Display="expand" Absent="disallow">
-      <Feature Id="binaries" Title="ODBC Driver" Level="1" Description="The ODBC driver and supporting libraries." ConfigurableDirectory="BINDIR" Absent="disallow">
-        <MergeRef Id="psqlodbcm" />
-      </Feature>     
-    </Feature>
-    <Media Id="1" EmbedCab="yes" Cabinet="psqlodbc.cab"/>
-    
-<!-- Properties -->
-
-    <Property Id="UILANG" Value="1033"/>
-    <Property Id="_Title">{\Arial8Bold}</Property>
-    <Property Id="DefaultUIFont">MSSansSerif8</Property>
-    <Property Id="ALLUSERS">2</Property>
-    
-<!-- UI -->
-
-    <UI>
-      <TextStyle Id="Arial8Bold" FaceName="Arial" Size="8" Bold="yes" />
-      <TextStyle Id="Arial14" FaceName="Arial" Size="14" />
-      <TextStyle Id="MSSansSerif8" FaceName="MS Sans Serif" Size="8" />
-
-<!-- Bitmaps -->
-
-      <Binary Id="BannerBmp" src="banner.bmp" />
-      <Binary Id="UpBmp" src="up.bmp" />
-      <Binary Id="NewBmp" src="new.bmp" />
-        
-<!-- UI Text -->
-
-      <UIText Id="AbsentPath" />
-      <UIText Id="bytes">bytes</UIText>
-      <UIText Id="GB">GB</UIText>
-      <UIText Id="KB">KB</UIText>
-      <UIText Id="MB">MB</UIText>
-      <UIText Id="MenuAbsent">Entire feature will be unavailable</UIText>
-      <UIText Id="MenuCD">Will be installed to run from CD</UIText>
-      <UIText Id="MenuLocal">Will be installed on local hard drive</UIText>
-      <UIText Id="MenuNetwork">Will be installed to run from network</UIText>
-      <UIText Id="NewFolder">Fldr|New Folder</UIText>
-      <UIText Id="SelAbsentAbsent">This feature will remain uninstalled</UIText>
-      <UIText Id="SelAbsentCD">This feature will be installed to run from CD</UIText>
-      <UIText Id="SelAbsentLocal">This feature will be installed on the local hard drive</UIText>
-      <UIText Id="SelAbsentNetwork">This feature will be installed to run from the network</UIText>
-      <UIText Id="SelCDAbsent">This feature will be uninstalled completely, you won't be able to run it from CD</UIText>
-      <UIText Id="SelCDCD">This feature will remain to be run from CD</UIText>
-      <UIText Id="SelCDLocal">This feature will change from run from CD state to be installed on the local hard drive</UIText>
-      <UIText Id="SelChildCostNeg">This feature frees up [1] on your hard drive.</UIText>
-      <UIText Id="SelChildCostPos">This feature requires [1] on your hard drive.</UIText>
-      <UIText Id="SelLocalAbsent">This feature will be completely removed</UIText>
-      <UIText Id="SelLocalCD">This feature will be removed from your local hard drive, but will be still available to run from CD</UIText>
-      <UIText Id="SelLocalLocal">This feature will remain on your local hard drive</UIText>
-      <UIText Id="SelLocalNetwork">This feature will be removed from your local hard drive, but will be still available to run from the network</UIText>
-      <UIText Id="SelNetworkAbsent">This feature will be uninstalled completely, you won't be able to run it from the network</UIText>
-      <UIText Id="SelNetworkLocal">This feature will change from run from network state to be installed on the local hard drive</UIText>
-      <UIText Id="SelNetworkNetwork">This feature will remain to be run from the network</UIText>
-      <UIText Id="SelParentCostNegNeg">This feature frees up [1] on your hard drive. It has [2] of [3] subfeatures selected. The subfeatures free up [4] on your hard drive.</UIText>
-      <UIText Id="SelParentCostNegPos">This feature frees up [1] on your hard drive. It has [2] of [3] subfeatures selected. The subfeatures require [4] on your hard drive.</UIText>
-      <UIText Id="SelParentCostPosNeg">This feature requires [1] on your hard drive. It has [2] of [3] subfeatures selected. The subfeatures free up [4] on your hard drive.</UIText>
-      <UIText Id="SelParentCostPosPos">This feature requires [1] on your hard drive. It has [2] of [3] subfeatures selected. The subfeatures require [4] on your hard drive.</UIText>
-      <UIText Id="VolumeCostAvailable">Available</UIText>
-      <UIText Id="VolumeCostDifference">Difference</UIText>
-      <UIText Id="VolumeCostRequired">Required</UIText>
-      <UIText Id="VolumeCostSize">Disk Size</UIText>
-      <UIText Id="VolumeCostVolume">Volume</UIText>
-      <UIText Id="TimeRemaining">Time remaining: {[1] minutes }{[2] seconds}</UIText>
-      <UIText Id="SelNetworkAdvertise">This feature will change from run from network state to set to be installed when required</UIText>
-      <UIText Id="SelLocalAdvertise">This feature will be removed from your local hard drive, but will be set to be installed when required</UIText>
-      <UIText Id="SelCostPending">Compiling cost for this feature...</UIText>
-      <UIText Id="SelCDAdvertise">This feature will change from run from CD state to set to be installed when required</UIText>
-      <UIText Id="SelAdvertiseNetwork">This feature will be available to run from the network</UIText>
-      <UIText Id="SelAdvertiseLocal">This feature will be installed on your local hard drive</UIText>
-      <UIText Id="SelAdvertiseCD">This feature will be available to run from CD</UIText>
-      <UIText Id="SelAdvertiseAdvertise">Will be installed when required</UIText>
-      <UIText Id="SelAdvertiseAbsent">This feature will become unavailable</UIText>
-      <UIText Id="SelAbsentAdvertise">This feature will be set to be installed when required</UIText>
-      <UIText Id="MenuAllNetwork">Entire feature will be installed to run from network</UIText>
-      <UIText Id="MenuAllLocal">Entire feature will be installed on local hard drive</UIText>
-      <UIText Id="MenuAllCD">Entire feature will be installed to run from CD</UIText>
-      <UIText Id="ScriptInProgress">Gathering required information...</UIText>
-      <UIText Id="MenuAdvertise">Feature will be installed when required</UIText>
-      
-<!-- Cancel dialog -->
-
-      <Dialog Id="Cancel" Width="233" Height="127" Title="psqlODBC+ $(var.VERSION)" NoMinimize="yes">
-        <Control Id="No" Type="PushButton" X="101" Y="101" Width="56" Height="17" Default="yes">
-          <Text>&amp;Resume</Text>
-          <Publish Event="EndDialog" Value="Return">1</Publish>
-        </Control>
-        <Control Id="Yes" Type="PushButton" X="164" Y="101" Width="56" Height="17" Cancel="yes">
-          <Text>&amp;Exit Setup</Text>
-          <Publish Event="EndDialog" Value="Exit">1</Publish>
-        </Control>
-        <Control Id="Text" Type="Text" X="10" Y="9" Width="210" Height="59">
-          <Text>Installation is not complete.  If you quit the setup program now, the application will not be installed. You can run the setup program at a later time to complete the installation.</Text>
-        </Control>
-        <Control Id="Text2515" Type="Text" X="10" Y="68" Width="210" Height="30">
-          <Text>To continue installing, click Resume.  To quit the setup program, click Exit Setup.</Text>
-        </Control>
-      </Dialog>
-
-<!-- Fatal Error dialog -->
-
-      <Dialog Id="Fatal_Error" X="40" Y="40" Width="240" Height="81" Title="Fatal Error">
-        <Control Id="OK" Type="PushButton" X="172" Y="56" Width="56" Height="17" Default="yes">
-          <Text>OK</Text>
-          <Publish Event="EndDialog" Value="Exit">1</Publish>
-        </Control>
-        <Control Id="Text" Type="Text" X="10" Y="9" Width="220" Height="37">
-          <Text>Installation ended prematurely because of an error.</Text>
-        </Control>
-      </Dialog>
-
-<!-- User Exit dialog -->
-
-      <Dialog Id="User_Exit" Width="240" Height="81" Title="psqlODBC+ Setup Cancelled">
-        <Control Id="OK" Type="PushButton" X="172" Y="56" Width="56" Height="17" Default="yes">
-          <Text>OK</Text>
-          <Publish Event="EndDialog" Value="Exit">1</Publish>
-        </Control>
-        <Control Id="Text" Type="Text" X="10" Y="9" Width="220" Height="44">
-          <Text>psqlODBC+ Setup was interrupted before it was fully installed.</Text>
-        </Control>
-      </Dialog>
-
-<!-- Exit dialog -->
-
-      <Dialog Id="Exit_Dialog" Width="375" Height="270" Title="psqlODBC+ $(var.VERSION)">
-        
-        <!-- common dialog items -->
-        <Control Id="wc_bmp" Type="Bitmap" X="0" Y="-15" Width="375" Height="70" Text="BannerBmp" FixedSize="yes" />
-        <Control Id="wc_l1" Type="Line" X="0" Y="46" Width="378" Height="1" />
-        <Control Id="wc_l2" Type="Line" X="0" Y="234" Width="378" Height="1" />
-      
-        <!-- dialog buttons -->
-        <Control Id="OK" Type="PushButton" X="244" Y="244" Width="56" Height="17" Default="yes" Cancel="yes">
-          <Text>&amp;Finish</Text>
-          <Publish Event="EndDialog" Value="Return">1</Publish>
-        </Control>
-        <Control Id="PushButton" Type="PushButton" X="189" Y="244" Width="56" Height="17">
-          <Text>&lt; &amp;Back</Text>
-          <Publish Event="EndDialog" Value="Return">1</Publish>
-          <Condition Action="disable">1</Condition>
-        </Control>
-        <Control Id="PushButton1" Type="PushButton" X="309" Y="244" Width="56" Height="17">
-          <Text>Cancel</Text>
-          <Publish Event="EndDialog" Value="Return">1</Publish>
-          <Condition Action="disable">1</Condition>
-        </Control>
-      
-        <!-- dialog specific controls -->
-        <Control Id="uit1" Type="Text" X="8" Y="16" Width="365" Height="15" Transparent="yes">
-          <Text>{\Arial10Bold}Installation complete!</Text>
-        </Control>
-        <Control Id="ui2" Type="Text" X="10" Y="75" Width="365" Height="30" Transparent="yes">
-          <Text>Congratulations, psqlODBC+ $(var.VERSION) has been successfully installed on your system.</Text>
-        </Control>  
-        <Control Id="wc_txt3" Type="Text" X="10" Y="200" Width="365" Height="30" Transparent="yes">
-          <Text>Click the finish button to exit from the installer.</Text>
-        </Control>
-      </Dialog>
-      
-<!-- Browse dialog --> 
-
-      <Dialog Id="Browse" Width="348" Height="193" Title="psqlODBC+ $(var.VERSION)">
-        <Control Id="TailText" Type="Text" X="9" Y="151" Width="55" Height="14" TabSkip="no">
-          <Text>&amp;Folder name:</Text>
-        </Control>
-        <Control Id="Tail" Type="PathEdit" X="65" Y="147" Width="212" Height="18" Property="_BrowseProperty" Indirect="yes">
-          <Text></Text>
-        </Control>
-        <Control Id="OK" Type="PushButton" X="282" Y="148" Width="56" Height="17" Default="yes">
-          <Text>OK</Text>
-          <Publish Event="SetTargetPath" Value="[_BrowseProperty]">1</Publish>
-          <Publish Event="EndDialog" Value="Return">1</Publish>
-        </Control>
-        <Control Id="Cancel" Type="PushButton" X="282" Y="172" Width="56" Height="17" Cancel="yes">
-          <Text>Cancel</Text>
-          <Publish Event="Reset" Value="0">1</Publish>
-          <Publish Event="EndDialog" Value="Return">NOT BaseBrowse</Publish>
-          <Publish Event="SpawnDialog" Value="Cancel">BaseBrowse</Publish>
-        </Control>
-        <Control Id="ComboText" Type="Text" X="10" Y="13" Width="54" Height="15" TabSkip="no">
-          <Text>&amp;Look in:</Text>
-        </Control>
-        <Control Id="Combo" Type="DirectoryCombo" X="65" Y="10" Width="230" Height="80" Property="_BrowseProperty" Indirect="yes" Removable="yes" Fixed="yes" Remote="yes" CDROM="yes">
-          <Text></Text>
-          <Subscribe Event="IgnoreChange" Attribute="IgnoreChange" />
-        </Control>
-        <Control Id="Up" Type="PushButton" X="300" Y="9" Width="17" Height="17" Icon="yes" FixedSize="yes" IconSize="16" Text="UpBmp">
-          <Publish Event="DirectoryListUp" Value="0">1</Publish>
-        </Control>
-        <Control Id="NewFolder" Type="PushButton" X="320" Y="9" Width="17" Height="17" Icon="yes" FixedSize="yes" IconSize="16" Text="NewBmp">
-          <Publish Event="DirectoryListNew" Value="0">1</Publish>
-        </Control>
-        <Control Id="List" Type="DirectoryList" X="8" Y="29" Width="330" Height="115" Property="_BrowseProperty" Sunken="yes" Indirect="yes" TabSkip="no" />
-      </Dialog>
-      
-<!-- Welcome dialog -->
-
-      <Dialog Id="Welcome_Dialog" Width="375" Height="270" Title="psqlODBC+ $(var.VERSION)" CustomPalette="yes">
-      
-        <!-- common dialog items -->
-        <Control Id="wc_bmp" Type="Bitmap" X="0" Y="-15" Width="375" Height="70" Text="BannerBmp" FixedSize="yes" />
-        <Control Id="wc_l1" Type="Line" X="0" Y="46" Width="378" Height="1" />
-        <Control Id="wc_l2" Type="Line" X="0" Y="234" Width="378" Height="1" />
-     
-        <!-- dialog buttons -->
-        <Control Id="Next" Type="PushButton" X="244" Y="244" Width="56" Height="17" Default="yes">
-          <Text>&amp;Next &gt;</Text>
-          <Publish Event="NewDialog" Value="Licence_Dialog">1</Publish>
-        </Control>
-        <Control Id="Previous" Type="PushButton" X="189" Y="244" Width="56" Height="17" Disabled="yes">
-          <Text>&lt; &amp;Back</Text>
-        </Control>
-        <Control Id="Cancel" Type="PushButton" X="309" Y="244" Width="56" Height="17" Cancel="yes">
-          <Text>Cancel</Text>
-          <Publish Event="SpawnDialog" Value="Cancel">1</Publish>
-        </Control>
-      
-        <!-- dialog specific controls -->
-        <Control Id="wc_txt1" Type="Text" X="8" Y="16" Width="365" Height="15" Transparent="yes">
-          <Text>{\Arial10Bold}Welcome to the psqlODBC+ Installation Wizard</Text>
-        </Control>
-        <Control Id="wc_txt2" Type="Text" X="10" Y="75" Width="365" Height="30" Transparent="yes">
-          <Text>It is strongly recommended that you exit all Windows programs before continuing with this installation.</Text>
-        </Control>
-        <Control Id="wc_txt3" Type="Text" X="12" Y="100" Width="365" Height="30" Transparent="yes">
-          <Text>Click the 'Next' button to continue, or 'Cancel' if you wish to abort the installation and try again later.</Text>
-        </Control>
-      </Dialog>
-      
-<!-- Licence Dialogue -->
-
-      <Dialog Id="Licence_Dialog" Width="375" Height="270" Title="psqlODBC+ $(var.VERSION)" CustomPalette="yes">
-        
-        <!-- common dialog items -->
-        <Control Id="wc_bmp" Type="Bitmap" X="0" Y="-15" Width="375" Height="70" Text="BannerBmp" FixedSize="yes" />
-        <Control Id="wc_l1" Type="Line" X="0" Y="46" Width="378" Height="1" />
-        <Control Id="wc_l2" Type="Line" X="0" Y="234" Width="378" Height="1" />
-        
-        <!-- dialog buttons -->
-        <Control Id="Next" Type="PushButton" X="244" Y="244" Width="56" Height="17" Default="yes">
-          <Text>&amp;Next &gt;</Text>
-          <Publish Event="NewDialog" Value="Selection_Dialog">1</Publish>
-        </Control>
-        <Control Id="Previous" Type="PushButton" X="189" Y="244" Width="56" Height="17">
-          <Text>&lt; &amp;Back</Text>
-          <Publish Event="NewDialog" Value="Welcome_Dialog">1</Publish>
-        </Control>
-        <Control Id="Cancel" Type="PushButton" X="309" Y="244" Width="56" Height="17" Cancel="yes">
-          <Text>Cancel</Text>
-          <Publish Event="SpawnDialog" Value="Cancel">1</Publish>
-        </Control>
-        
-        <!-- dialog specific controls -->
-        <Control Id="wt1" Type="Text" X="8" Y="16" Width="365" Height="15" Transparent="yes">
-           <Text>{\Arial10Bold}Licence</Text>
-        </Control>
-        <Control Id="wt2" Type="Text" X="5" Y="55" Width="365" Height="15">
-          <Text>Please read the psqlODBC+ licence completely before you continue.</Text>
-        </Control>
-        <Control Id="lgpl_rtf" Type="ScrollableText" X="5" Y="73" Width="365" Height="155" Sunken="yes">
-          <Text src="lgpl.rtf" />
-        </Control>
-      </Dialog>
-      
-<!-- Feature selection dialog -->
-
-      <Dialog Id="Selection_Dialog" Width="375" Height="270" Title="psqlODBC+ $(var.VERSION)" CustomPalette="yes">
-       
-        <!-- common dialog items -->
-        <Control Id="wc_bmp" Type="Bitmap" X="0" Y="-15" Width="375" Height="70" Text="BannerBmp" FixedSize="yes" />
-        <Control Id="wc_l1" Type="Line" X="0" Y="46" Width="378" Height="1" />
-        <Control Id="wc_l2" Type="Line" X="0" Y="234" Width="378" Height="1" />
-            
-        <!-- dialog buttons -->
-        <Control Id="Next" Type="PushButton" X="244" Y="244" Width="56" Height="17" Default="yes">
-          <Text>&amp;Next &gt;</Text>
-          <Publish Event="NewDialog" Value="Ready_Dialog">1</Publish>
-        </Control>
-        <Control Id="Previous" Type="PushButton" X="189" Y="244" Width="56" Height="17">
-          <Text>&lt; &amp;Back</Text>
-          <Publish Event="NewDialog" Value="Licence_Dialog">1</Publish>
-        </Control>
-        <Control Id="Cancel" Type="PushButton" X="309" Y="244" Width="56" Height="17" Cancel="yes">
-          <Text>Cancel</Text>
-          <Publish Event="SpawnDialog" Value="Cancel">1</Publish>
-        </Control>
-            
-        <!-- dialog specific controls -->
-        <Control Id="ot1" Type="Text" X="8" Y="16" Width="365" Height="15" Transparent="yes">
-          <Text>{\Arial10Bold}Feature selection</Text>
-        </Control>
-        <Control Id="FeatureTree" Type="SelectionTree" X="5" Y="56" Width="205" Height="133" Property="_BrowseProperty" />
-        <Control Id="SelectionFrame" Type="GroupBox" X="216" Y="51" Width="150" Height="135" />
-        <Control Id="ItemDescription" Type="Text" X="221" Y="61" Width="136" Height="80">
-          <Subscribe Event="SelectionDescription" Attribute="Text" />
-        </Control>
-        <Control Id="Size" Type="Text" X="221" Y="135" Width="137" Height="45">
-          <Subscribe Event="SelectionSize" Attribute="Text" />
-        </Control>
-        <Control Id="LocationFrame" Type="GroupBox" X="5" Y="190" Width="360" Height="40" />
-        <Control Id="LocationPath" Type="Text" X="11" Y="213" Width="283" Height="11">
-          <Text>Path</Text>
-          <Subscribe Event="SelectionPath" Attribute="Text" /> 
-        </Control>
-        <Control Id="LocationText" Type="Text" X="11" Y="200" Width="261" Height="11">
-          <Text>Current location:</Text>
-          <Subscribe Event="SelectionPathOn" Attribute="Visible" />
-          <Condition Action="hide">Installed</Condition>
-        </Control>
-            
-        <Control Id="PushButton44" Type="PushButton" X="300" Y="209" Width="56" Height="17" TabSkip="yes">
-          <Text>B&amp;rowse</Text>
-          <Publish Event="SelectionBrowse" Value="Browse">1</Publish>
-        </Control>
-      </Dialog>
-  
-<!-- Ready dialogue -->
-
-      <Dialog Id="Ready_Dialog" Width="375" Height="270" Title="psqlODBC+ $(var.VERSION)" CustomPalette="yes">
-         
-        <!-- common dialog items -->
-        <Control Id="wc_bmp" Type="Bitmap" X="0" Y="-15" Width="375" Height="70" Text="BannerBmp" FixedSize="yes" />
-        <Control Id="wc_l1" Type="Line" X="0" Y="46" Width="378" Height="1" />
-        <Control Id="wc_l2" Type="Line" X="0" Y="234" Width="378" Height="1" />
-         
-        <!-- dialog buttons -->
-        <Control Id="Next" Type="PushButton" X="244" Y="244" Width="56" Height="17" Default="yes">
-          <Text>&amp;Next &gt;</Text>
-          <Publish Event="Remove" Value="ALL">MaintenanceType = "Remove"</Publish>
-          <Publish Event="EndDialog" Value="Return">1</Publish>
-        </Control>
-        <Control Id="Previous" Type="PushButton" X="189" Y="244" Width="56" Height="17">
-          <Text>&lt; &amp;Back</Text>
-          <Publish Event="NewDialog" Value="Selection_Dialog">1</Publish>
-        </Control>
-        <Control Id="Cancel" Type="PushButton" X="309" Y="244" Width="56" Height="17" Cancel="yes">
-          <Text>Cancel</Text>
-          <Publish Event="SpawnDialog" Value="Cancel">1</Publish>
-        </Control>
-        
-        <!-- dialog specific controls -->
-        <Control Id="re_txt1" Type="Text" X="8" Y="16" Width="365" Height="15" Transparent="yes">
-          <Text>{\Arial10Bold}Ready to install</Text>
-        </Control>
-        <Control Id="re_txt2" Type="Text" X="5" Y="80" Width="365" Height="30">
-          <Text>psqlODBC+ is now ready to be installed. Click Next to complete the installation.</Text>
-        </Control>
-      </Dialog>
-  
-<!-- Progress Dialogue -->
-
-      <Dialog Id="Progress_Dialog" Width="375" Height="270" Title="psqlODBC+ $(var.VERSION)" CustomPalette="yes" Modeless="yes">
-    
-        <!-- common dialog items -->
-        <Control Id="wc_bmp" Type="Bitmap" X="0" Y="-15" Width="375" Height="70" Text="BannerBmp" FixedSize="yes" />
-        <Control Id="wc_l1" Type="Line" X="0" Y="46" Width="378" Height="1" />
-        <Control Id="wc_l2" Type="Line" X="0" Y="234" Width="378" Height="1" />
-        
-        <!-- dialog specific controls -->
-        <Control Id="ct1" Type="Text" X="8" Y="16" Width="365" Height="15" Transparent="yes">
-          <Text>{\Arial10Bold}Installing...</Text>
-        </Control>
-        <Control Id="Cancel" Type="PushButton" X="309" Y="244" Width="56" Height="17" Cancel="yes">
-          <Text>Cancel</Text>
-          <Publish Event="SpawnDialog" Value="Cancel">1</Publish>
-        </Control>
-        <Control Id="progtxt" Type="Text" X="15" Y="100" Width="340" Height="15">
-          <Subscribe Event="ActionText" Attribute="Text" />
-        </Control>
-        <Control Id="progdata" Type="Text" X="15" Y="75" Width="340" Height="15">
-          <Text>Initializing...</Text>
-          <Subscribe Event="ActionData" Attribute="Text" />
-        </Control>
-        <Control Id="progress" Type="ProgressBar" X="15" Y="130" Width="340" Height="20" ProgressBlocks="yes" Text="Install progress">
-          <Subscribe Event="SetProgress" Attribute="Progress" />
-        </Control>
-      </Dialog>
-  
-<!-- UI Sequence -->
-
-      <InstallUISequence>
-      
-        <Show Dialog="Fatal_Error" OnExit="error" />
-        <Show Dialog="User_Exit" OnExit="cancel" />
-        <Show Dialog="Exit_Dialog" OnExit="success" />
-
-        <LaunchConditions After="AppSearch" />
-    
-        <Show Dialog="Welcome_Dialog" After="MigrateFeatureStates">NOT Installed</Show>
-        <Show Dialog="Progress_Dialog" After="Welcome_Dialog" />
-        
-      </InstallUISequence>
-      
-    </UI>   
-  </Product>
-</Wix>
diff --git a/installer/psqlodbcm.wxs b/installer/psqlodbcm.wxs
deleted file mode 100644
index 56dc5c3..0000000
--- a/installer/psqlodbcm.wxs
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
-  <Module 
-    Id="psqlODBC+"
-    Guid="20C54A9D-C67E-414c-B224-7FE3A0D60C5C" 
-    Version="$(var.VERSION)" 
-    Language="1033">
-    
-    <Package 
-      Id="ECD6D9C0-B7BD-45cc-A897-5B48AAA8E0D3" 
-      Description="PostgreSQL ODBC Driver (enhanced build)"
-      Keywords="PostgreSQL, ODBC" 
-      Manufacturer="PostgreSQL Global Development Group" 
-      InstallerVersion="110" 
-      Platforms="Intel" 
-      Languages="1033" 
-      Compressed="yes" 
-      SummaryCodepage="1252" />
-    
-    <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="BINDIR" Name=".">
-        <Component Id="psqlodbc.files" Guid="A0AD3589-F71E-4c13-A580-53E83D6E9031">
-        
-          <!-- PostgreSQL -->
-          <File Id="psqlodbc35w.dll" LongName="psqlodbc35w.dll" Name="psqlodxA.dll" src="../Unicode30/psqlodbc35w.dll" />
-          <File Id="libpq.dll" Name="libpq.dll" src="$(var.PROGRAMFILES)\PostgreSQL\8.1\bin\libpq.dll" KeyPath="yes" />
-          
-          <!-- Gettext -->
-          <File Id="libintl_2.dll" LongName="libintl-2.dll" Name="libintXX.dll" src="$(var.PROGRAMFILES)\PostgreSQL\8.1\bin\libintl-2.dll" />
-          <File Id="libiconv_2.dll" LongName="libiconv-2.dll" Name="libicoXX.dll" src="$(var.PROGRAMFILES)\PostgreSQL\8.1\bin\libiconv-2.dll" />
-          
-          <!-- SSL -->
-          <File Id="libeay32.dll" Name="libeay32.dll" src="$(var.PROGRAMFILES)\PostgreSQL\8.1\bin\libeay32.dll" />
-          <File Id="ssleay32.dll" Name="ssleay32.dll" src="$(var.PROGRAMFILES)\PostgreSQL\8.1\bin\ssleay32.dll" />
- 
-          <!-- MIT Kerberos -->
-          <File Id="comerr32.dll" Name="comerr32.dll" src="$(var.PROGRAMFILES)\PostgreSQL\8.1\bin\comerr32.dll" />
-          <File Id="krb5_32.dll" Name="krb5_32.dll" src="$(var.PROGRAMFILES)\PostgreSQL\8.1\bin\krb5_32.dll" />
-          
-          <!-- Note, installing the driver properly (IE, using ODBCDriver) has proven unreliable -->
-          <!--       so we install the registry keys manually ourselves.                         -->
-          <Registry Id="psqlodbca.reg.1" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\ODBC Drivers" Name="PostgreSQL+" Type="string" Value="Installed" />
-          <Registry Id="psqlodbca.reg.2" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL+" Name="APILevel" Type="string" Value="1" />
-          <Registry Id="psqlodbca.reg.3" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL+" Name="ConnectFunctions" Type="string" Value="YYN" />
-          <Registry Id="psqlodbca.reg.4" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL+" Name="Driver" Type="string" Value="[#psqlodbc35w.dll]" />
-          <Registry Id="psqlodbca.reg.5" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL+" Name="DriverODBCVer" Type="string" Value="03.51" />
-          <Registry Id="psqlodbca.reg.6" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL+" Name="FileUsage" Type="string" Value="0" />
-          <Registry Id="psqlodbca.reg.7" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL+" Name="Setup" Type="string" Value="[#psqlodbc35w.dll]" />
-          <Registry Id="psqlodbca.reg.8" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL+" Name="SQLLevel" Type="string" Value="1" />
-          <Registry Id="psqlodbca.reg.9" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL+" Name="UsageCount" Type="integer" Value="1" />
-        </Component>
-      </Directory>
-    </Directory>
-     
-  </Module>
-</Wix>
diff --git a/installer/up.bmp b/installer/up.bmp
deleted file mode 100644
index 86f6b5a..0000000
--- a/installer/up.bmp
+++ /dev/null
diff --git a/installer/upgrade.bat b/installer/upgrade.bat
deleted file mode 100644
index d6f6e3d..0000000
--- a/installer/upgrade.bat
+++ /dev/null
@@ -1,23 +0,0 @@
-@echo off

-cls

-echo This file will upgrade your psqlODBC+ installation.

-echo.

-echo You must have psqlODBC+ 07.03.0260 or above installed 

-echo from the official MSI installation to use this upgrade path.

-echo.

-echo If psqlODBC+ or any of it's components are in use

-echo a reboot will be required once the upgrade is completed.

-echo.

-echo.

-echo Press Ctrl-C to abort the upgrade or

-pause

-

-REM Parameters described:

-REM  /i psqlodbc.msi           - pick MSI file to install. All properties

-REM                              will be read from existing installation.

-REM  REINSTALLMODE=vamus       - reinstall all files, regardless of version.

-REM                              This makes sure documentation and other

-REM                              non-versioned files are updated.

-REM  REINSTALL=ALL             - Reinstall all features that were previously

-REM                              installed with the new version.

-msiexec /i psqlodbc.msi REINSTALLMODE=vamus REINSTALL=ALL /qr