From 78708234bd45fedb10b55062c7db36c71b90d691 Mon Sep 17 00:00:00 2001
From: "Ronald S. Bultje" <rbultje@ronald.bitfreak.net>
Date: Sun, 2 Nov 2003 14:17:17 +0000
Subject: [PATCH] Add QPL and GPL/QPL, plus add links to licenses

Original commit message from CVS:
Add QPL and GPL/QPL, plus add links to licenses
---
 gst/gstplugin.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/gst/gstplugin.c b/gst/gstplugin.c
index 0ae37e6545..19b451e10b 100644
--- a/gst/gstplugin.c
+++ b/gst/gstplugin.c
@@ -42,10 +42,17 @@ static GList *_gst_plugin_static = NULL;
 /* list of valid licenses.
  * One of these must be specified or the plugin won't be loaded 
  * Contact gstreamer-devel@lists.sourceforge.net if your license should be 
- * added. */
+ * added.
+ *
+ * GPL: http://www.gnu.org/copyleft/gpl.html
+ * LGPL: http://www.gnu.org/copyleft/lesser.html
+ * QPL: http://www.trolltech.com/licenses/qpl.html
+ */
 static gchar *valid_licenses[] = {
   "LGPL",			/* GNU Lesser General Public License */
   "GPL",			/* GNU General Public License */
+  "QPL",			/* Trolltech Qt Public License */
+  "GPL/QPL",			/* Combi-license of GPL + QPL */
   GST_LICENSE_UNKNOWN,		/* some other license */
   NULL
 };