Merge branch 'upstream/15.0' into tizen

[platform/upstream/pulseaudio.git] / LICENSE

diff --git a/LICENSE b/LICENSE
index 226c4ce..8dfc62a 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
-All PulseAudio source files are licensed under the GNU Lesser General Public
-License. (see file LGPL for details)
+All PulseAudio source files, except as noted below, are licensed under the GNU
+Lesser General Public License. (see file LGPL for details)
 
 However, the server side has optional GPL dependencies.  These include the
 libsamplerate and gdbm (core libraries), LIRC (lirc module) and FFTW (equalizer
@@ -26,9 +26,12 @@ details.
 
 Some other files pulled into PA source (i.e. reference implementations that are
 considered too small and stable to be considered as an external library) use the
-more permissive MIT license. This include the device reservation DBus protocol
+more permissive MIT license. These include the device reservation DBus protocol
 and realtime kit implementations.
 
+A more permissive BSD-style license is used for LFE filters, see
+src/pulsecore/filter/LICENSE.WEBKIT for details.
+
 Additionally, a more permissive Sun license is used for code that performs
 u-law, A-law and linear PCM conversions.