Clarified that TAP-Win32 driver is licensed under GPL 2.

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@5265 e7ae566f-a301-0410-adde-c780ea21d3b5

COPYING

@@ -53,10 +53,7 @@ TAP-Win32/TAP-Win64 Driver license:
 
   The source and object code of the TAP-Win32/TAP-Win64 driver
   is Copyright (C) 2002-2009 OpenVPN Technologies, Inc., and is released under
-  the GPL version 2 (see below), however due to the extra costs of
+  the GPL version 2.
-  supporting Windows Vista, OpenVPN Technologies, Inc. reserves the right to
-  change the terms of the TAP-Win32/TAP-Win64 license for versions 9.1
-  and higher prior to the official release of OpenVPN 2.1.
 
 Windows DDK Samples:
 --------------------

tap-win32/common.h

@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
+ *  and is released under the GPL version 2 (see below).
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2

tap-win32/constants.h

@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
+ *  and is released under the GPL version 2 (see below).
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2

tap-win32/dhcp.c

@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
+ *  and is released under the GPL version 2 (see below).
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2

tap-win32/dhcp.h

@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
+ *  and is released under the GPL version 2 (see below).
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2

tap-win32/endian.h

@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
+ *  and is released under the GPL version 2 (see below).
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2

tap-win32/error.c

@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
+ *  and is released under the GPL version 2 (see below).
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2

tap-win32/error.h

@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
+ *  and is released under the GPL version 2 (see below).
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2

tap-win32/hexdump.c

@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
+ *  and is released under the GPL version 2 (see below).
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2

tap-win32/hexdump.h

@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
+ *  and is released under the GPL version 2 (see below).
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2

tap-win32/instance.c

@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
+ *  and is released under the GPL version 2 (see below).
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2

tap-win32/lock.h

@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
+ *  and is released under the GPL version 2 (see below).
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2

tap-win32/macinfo.c

@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
+ *  and is released under the GPL version 2 (see below).
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2

tap-win32/macinfo.h

@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
+ *  and is released under the GPL version 2 (see below).
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2

tap-win32/mem.c

@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
+ *  and is released under the GPL version 2 (see below).
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2

tap-win32/proto.h

@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
+ *  and is released under the GPL version 2 (see below).
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2

tap-win32/prototypes.h

@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
+ *  and is released under the GPL version 2 (see below).
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2

tap-win32/tapdrvr.c

@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
+ *  and is released under the GPL version 2 (see below).
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2

tap-win32/types.h

@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
+ *  and is released under the GPL version 2 (see below).
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2