From 6bf7517715b59f53e774787e4bddb246b034396d Mon Sep 17 00:00:00 2001 From: "David G. Holm" Date: Thu, 7 Jun 2001 15:31:23 +0000 Subject: [PATCH] See ChangeLog entry 2001-06-07 11:30 UTC-0400 David G. Holm --- harbour/ChangeLog | 7 +++-- harbour/contrib/libct/alt/token1.prg | 41 ++++++++++++++++++++-------- 2 files changed, 33 insertions(+), 15 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index e067fbe707..f7a236b7df 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,5 +1,6 @@ 2001-06-07 11:30 UTC-0400 David G. Holm + * contrib\libct\alt\token1.prg * contrib/libmisc/hb_f.c * source/debug/dbgwa.prg * source/lang/msgid.c @@ -15,9 +16,9 @@ new Harbour License and Exception with permission from Andi Jahja , April White , - Ignacio_Ortiz_de_Zúñiga , and - Kwon,OJun (Charles Kwon) - + Ignacio_Ortiz_de_Zúñiga , + Kwon,OJun (Charles Kwon) , and + Phil Barnett 2001-06-07 17:06 GMT+1 Patrick Mast + contrib/tprepro/tprepro.prg diff --git a/harbour/contrib/libct/alt/token1.prg b/harbour/contrib/libct/alt/token1.prg index 9b37918ff8..0e68f19374 100644 --- a/harbour/contrib/libct/alt/token1.prg +++ b/harbour/contrib/libct/alt/token1.prg @@ -11,15 +11,8 @@ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version, with one exception: - * - * The exception is that if you link the Harbour Runtime Library (HRL) - * and/or the Harbour Virtual Machine (HVM) with other files to produce - * an executable, this does not by itself cause the resulting executable - * to be covered by the GNU General Public License. Your use of that - * executable is in no way restricted on account of linking the HRL - * and/or HVM code into it. + * the Free Software Foundation; either version 2, or (at your option) + * any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -27,9 +20,33 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA (or visit - * their web site at http://www.gnu.org/). + * along with this software; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. * */