--- Merging r16798 into '.':

U    packages/fftw/fpmake.pp

# revisions: 16798
------------------------------------------------------------------------
r16798 | marco | 2011-01-21 16:07:44 +0100 (Fri, 21 Jan 2011) | 3 lines
Changed paths:
   M /trunk/packages/fftw/fpmake.pp

 * adapted FFTW licensing. This is a GPL lib, not MIT.
   It is _made_ by MIT, and commercially marketed by MIT, it is not MIT _licensed_

------------------------------------------------------------------------

git-svn-id: branches/fixes_2_4@17581 -

packages/fftw/fpmake.pp

@@ -20,7 +20,7 @@ begin
 
     P.Version:='2.4.5';
     P.Author := 'Library: Matteo Frigo and Steven G. Johnson, header: Daniel Mantione';
-    P.License := 'Library: MIT, header: LGPL with modification, ';
+    P.License := 'Library: GPL or commercial, header: LGPL with modification, ';
     P.HomepageURL := 'www.freepascal.org';
     P.Email := '';
     P.Description := 'Library for computing the discrete Fourier transform (DFT) in one or more dimensions, of arbitrary input size, and of both real and complex data';