summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorChristian Pointner <equinox@helsinki.at>2014-09-20 14:00:19 (GMT)
committerChristian Pointner <equinox@helsinki.at>2014-09-20 14:00:19 (GMT)
commit0e16b63aafea8475a35447f94e2d79b1601f02c5 (patch)
treea8125b884b661f31617710a7ffebd37ce34c227e /LICENSE
parent5f4fceff0f892bf19a8f6176b17ea1ad2569bdf0 (diff)
add exception for non GPL GStreamer Plugins to License
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE8
1 files changed, 7 insertions, 1 deletions
diff --git a/LICENSE b/LICENSE
index c73bd4a..524a84a 100644
--- a/LICENSE
+++ b/LICENSE
@@ -4,7 +4,7 @@
* The Radio Helsinki Archive Daemon
*
*
- * Copyright (C) 2010-2014 Christian Pointner <equinox@helsinki.at>
+ * Copyright (C) 2009-2014 Christian Pointner <equinox@helsinki.at>
*
* This file is part of rharchive.
*
@@ -20,6 +20,12 @@
*
* You should have received a copy of the GNU General Public License
* along with rharchive. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * In addition, as a special exception, the copyright holders hereby
+ * grant permission for non-GPL-compatible GStreamer plugins to be used
+ * and distributed together with GStreamer and rharchive.
+ * This permission goes above and beyond the permissions granted by the
+ * GPL license rharchive is covered by.
*/
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007