ref: c901a46c7e2aee5ebc9916c42c063af79a1814a4
parent: 57c95135b22feaa9984eb88caad05cf8de17f224
author: Erik de Castro Lopo <erikd@mega-nerd.com>
date: Thu Aug 23 17:29:48 EDT 2012
doc/license.html : Specify GPLv2 or GPLv3.
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
* tests/multi_channel_test.c tests/snr_bw_test.c tests/varispeed_test.c
Use fftw_cleanup() to remove all memory leaks reported by valgrind.
+ * doc/license.html
+ Specify GPLv2 or GPLv3.
+
2012-08-22 Erik de Castro Lopo <erikd AT mega-nerd DOT com>
* src/src_sinc.c
--- a/doc/license.html
+++ b/doc/license.html
@@ -46,7 +46,7 @@
</DIV>
<IMG SRC=
- "/cgi-bin/Count.cgi?ft=6|frgb=55;55;55|tr=0|md=6|dd=B|st=1|sh=1|df=src_lic.dat"
+ "/cgi-bin/Count.cgi?ft=6|frgb=55;55;55|tr=0|md=6|dd=B|st=1|sh=1|df=src_lic.dat"
HEIGHT=30 WIDTH=100 ALT="counter.gif">
</DIV>
@@ -61,7 +61,7 @@
<!-- pepper -->
<P>
Secret Rabbit Code is released under a dual licensing scheme.
- Users can choose which of these two licenses they wish to operate
+ Users can choose which of these two licenses they wish to operate
under :
</P>
<!-- pepper -->
@@ -68,7 +68,7 @@
<UL>
<LI> The standard
<A HREF="http://www.gnu.org/copyleft/gpl.html">
- GNU General Public License
+ GNU General Public License (version 2 or version 3)
</A>
(GPL) as written and published by the Free Software Foundation.
<LI> The very generous
@@ -75,7 +75,7 @@
<A HREF="http://www.mega-nerd.com/SRC/libsamplerate-cul.pdf">
libsamplerate Commercial Use License
</A>
- that can be purchased for a one off payment of $1000 (one
+ that can be purchased for a one off payment of $1000 (one
thousand) Australian dollars.
</UL>
<!-- pepper -->
@@ -87,9 +87,9 @@
<!-- pepper -->
<P>
The commercial use license allows licensees to use libsamplerate as a
- statically linked library in proprietary, shareware or other closed
+ statically linked library in proprietary, shareware or other closed
source applications.
- The licensee may use libsamplerate in as many separate products as
+ The licensee may use libsamplerate in as many separate products as
they choose and sell as many copies of each as they can without paying
any further licensing fees for libsamplerate.
</P>
@@ -99,13 +99,13 @@
<A HREF="http://www.wordiq.com/definition/GNU_General_Public_License#GPL-related_disputes">
debate</A>
about whether non-GPL software can dynamically link to GPL libraries.
- I side with the FSF and assert that an executable dynamically linked
- to libsamplerate is a derivative work of libsamplerate and is
+ I side with the FSF and assert that an executable dynamically linked
+ to libsamplerate is a derivative work of libsamplerate and is
therefore subject to the GNU GPL.
</P>
<!-- pepper -->
<P>
- For more information, please see the
+ For more information, please see the
<A HREF="http://www.mega-nerd.com/SRC/procedure.html">
commercial use licensing procedure
</A>.