summaryrefslogtreecommitdiff
path: root/trunk/README-turbo.txt
diff options
context:
space:
mode:
authordcommander <dcommander@3789f03b-4d11-0410-bbf8-ca57d06f2519>2010-03-20 20:00:51 +0000
committerdcommander <dcommander@3789f03b-4d11-0410-bbf8-ca57d06f2519>2010-03-20 20:00:51 +0000
commitf1f2814bded3ea51506647aea07b536ddd80ee93 (patch)
tree532b167db91880750ceee16743a20df89d304235 /trunk/README-turbo.txt
parenteea3f699881d0043221eb0e585efbce9884a6586 (diff)
Clarify license description
git-svn-id: https://libjpeg-turbo.svn.sourceforge.net/svnroot/libjpeg-turbo@164 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'trunk/README-turbo.txt')
-rwxr-xr-xtrunk/README-turbo.txt9
1 files changed, 7 insertions, 2 deletions
diff --git a/trunk/README-turbo.txt b/trunk/README-turbo.txt
index f60454c..801af94 100755
--- a/trunk/README-turbo.txt
+++ b/trunk/README-turbo.txt
@@ -28,8 +28,13 @@ libraries can be used as drop-in replacements for libjpeg on most systems.
Some of the optimizations to the Huffman encoder/decoder were borrowed from
VirtualGL, and thus the libjpeg-turbo distribution, as a whole, falls under the
wxWindows Library Licence, Version 3.1. A copy of this license can be found in
-this directory under LICENSE.txt. The rest of the source code, apart from
-these modifications, falls under a less restrictive license (see README.)
+this directory under LICENSE.txt. The wxWindows Library License is based on
+the LGPL but includes provisions which allow the Library to be statically
+linked into proprietary libraries and applications without requiring the
+resulting binaries to be distributed under the terms of the LGPL.
+
+The rest of the source code, apart from these modifications, falls under a less
+restrictive, BSD-style license (see README.)
*******************************************************************************