summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorJosh Coalson <jcoalson@users.sourceforce.net>2006-11-20 06:46:07 +0000
committerJosh Coalson <jcoalson@users.sourceforce.net>2006-11-20 06:46:07 +0000
commitf37520b91fc43e69a0ab22eff8a48770acc369a9 (patch)
treed57eddfd5bcb6d88c374ec0be1786741632f3ba2 /README
parent338a0b13d22880686bfce1dbb39718f7fa30e90b (diff)
downloadflac-f37520b91fc43e69a0ab22eff8a48770acc369a9.tar.gz
final merge down from 1.1.2 maintenance branch (cvs up -j FLAC_RELEASE_1_1_2_MAINTENANCE_BASELINE -j FLAC_RELEASE_1_1_2_MAINTENANCE_BRANCH)
Diffstat (limited to 'README')
-rw-r--r--README8
1 files changed, 4 insertions, 4 deletions
diff --git a/README b/README
index 814a60c5..5fd0a6fe 100644
--- a/README
+++ b/README
@@ -5,10 +5,10 @@
* components distributed under difference licenses. The codec libraries
* are distributed under Xiph.Org's BSD-like license (see the file
* COPYING.Xiph in this distribution). All other programs, libraries, and
- * plugins are distributed under the GPL (see COPYING.GPL). The documentation
- * is distributed under the Gnu FDL (see COPYING.FDL). Each file in the
- * FLAC distribution contains at the top the terms under which it may be
- * distributed.
+ * plugins are distributed under the LGPL or GPL (see COPYING.LGPL and
+ * COPYING.GPL). The documentation is distributed under the Gnu FDL (see
+ * COPYING.FDL). Each file in the FLAC distribution contains at the top the
+ * terms under which it may be distributed.
*
* Since this particular file is relevant to all components of FLAC,
* it may be distributed under the Xiph.Org license, which is the least