diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-03-22 10:45:06 +0100 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-03-22 10:45:06 +0100 |
| commit | 007a00cd1bb4dfacc7c5aefb71f54770c2d21093 (patch) | |
| tree | cbe8a9007409ceec8c821397a86d888920299c76 /docs/faq | |
| parent | ab7d8886f039b709ed767642a46073bea9630fa6 (diff) | |
| parent | bb78f15e42c9fd52ed33b17656e347ca7fb307d3 (diff) | |
Merge branch 'master' into 0.11
Conflicts:
configure.ac
Diffstat (limited to 'docs/faq')
| -rw-r--r-- | docs/faq/general.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/faq/general.xml b/docs/faq/general.xml index c6ccb6ac7..e85bec0c9 100644 --- a/docs/faq/general.xml +++ b/docs/faq/general.xml @@ -99,7 +99,7 @@ What are the exact licensing terms for GStreamer and its plugins ? <answer> <para> All of GStreamer, including our own plugin code, is licensed under the -<ulink url="http://www.gnu.org/licenses/lgpl.html">GNU LGPL</ulink> license. +<ulink url="http://www.gnu.org/licenses/lgpl-2.1.html">GNU LGPL 2.1</ulink> license. Some of the libraries we use for some of the plugins are however under the GPL, which means that those plugins can not be used by a non-GPL-compatible application. |