From: Christian Schaller <uraeus@gnome.org>
Date: Tue, 27 Feb 2007 11:59:21 +0000 (+0000)
Subject: update copyright statement
X-Git-Tag: 1.19.3~509^2~12159
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=83e7dadbe6811b7f3f08dec75b09b7ae2667e003;p=platform%2Fupstream%2Fgstreamer.git

update copyright statement

Original commit message from CVS:
update copyright statement
---

diff --git a/ChangeLog b/ChangeLog
index 046143e..3ffd317 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-02-27  Christian Schallerr <christian@fluendo.com>
+
+	* sys/osxaudio: Add Pioneers of the inevitable to the copyright list
+
 2007-02-26  Jan Schmidt  <thaytan@mad.scientist.com>
 
 	* gst/rtsp/Makefile.am:
@@ -57,6 +61,7 @@
 	rtsp://user:pass@hostname/rtspstream work on hosts that require
 	authentication.
 
+>>>>>>> 1.2755
 2007-02-22  Edgard Lima <edgard.lima@indt.org.br>
 
 	* sys/v4l2/gstv4l2object.c:
diff --git a/sys/osxaudio/gstosxaudio.c b/sys/osxaudio/gstosxaudio.c
index 31f759b..6e9b87b 100644
--- a/sys/osxaudio/gstosxaudio.c
+++ b/sys/osxaudio/gstosxaudio.c
@@ -1,6 +1,6 @@
 /* GStreamer
  * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
- *
+ * Copyright (C) 2007 Pioneers of the Inevitable <songbird@songbirdnest.com>
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ -15,6 +15,9 @@
  * License along with this library; if not, write to the
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
+ * 
+ * The development of this code was made possible due to the involvement of Pioneers of the * Inevitable, the creators of the Songbird Music player
+ * 
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/sys/osxaudio/gstosxaudioelement.c b/sys/osxaudio/gstosxaudioelement.c
index 2ba4445..c3c2833 100644
--- a/sys/osxaudio/gstosxaudioelement.c
+++ b/sys/osxaudio/gstosxaudioelement.c
@@ -1,6 +1,7 @@
 /*
  * GStreamer
  * Copyright 2006 Zaheer Abbas Merali  <zaheerabbas at merali dot org>
+ * Copyright 2007 Pioneers of the Inevitable <songbird@songbirdnest.com>
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -39,6 +40,9 @@
  * License along with this library; if not, write to the
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
+ * 
+ * The development of this code was made possible due to the involvement of Pioneers of the * Inevitable, the creators of the Songbird Music player
+ * 
  */
 
 #include <gst/gst.h>
diff --git a/sys/osxaudio/gstosxaudioelement.h b/sys/osxaudio/gstosxaudioelement.h
index 0ae6920..1ab487a 100644
--- a/sys/osxaudio/gstosxaudioelement.h
+++ b/sys/osxaudio/gstosxaudioelement.h
@@ -1,6 +1,7 @@
 /*
  * GStreamer
  * Copyright 2006 Zaheer Abbas Merali  <zaheerabbas at merali dot org>
+ * Copyright 2007 Pioneers of the Inevitable <songbird@songbirdnest.com>
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -39,6 +40,9 @@
  * License along with this library; if not, write to the
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
+ *
+ * The development of this code was made possible due to the involvement of Pioneers of the * Inevitable, the creators of the Songbird Music player
+ * 
  */
 
 #ifndef __GST_OSX_AUDIO_ELEMENT_H__
@@ -64,4 +68,4 @@ struct _GstOsxAudioElementInterface {
 GType gst_osx_audio_element_get_type (void);
 
 
-#endif
\ No newline at end of file
+#endif
diff --git a/sys/osxaudio/gstosxaudiosink.c b/sys/osxaudio/gstosxaudiosink.c
index 0a203c9..43bcbdf 100644
--- a/sys/osxaudio/gstosxaudiosink.c
+++ b/sys/osxaudio/gstosxaudiosink.c
@@ -1,6 +1,7 @@
 /*
  * GStreamer
  * Copyright 2005,2006 Zaheer Abbas Merali  <zaheerabbas at merali dot org>
+ * Copyright 2007 Pioneers of the Inevitable <songbird@songbirdnest.com>
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -39,6 +40,10 @@
  * License along with this library; if not, write to the
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
+ *
+ *  The development of this code was made possible due to the involvement of Pioneers of i
+ *  the Inevitable, the creators of the Songbird Music player
+ *
  */
 
 /**
diff --git a/sys/osxaudio/gstosxaudiosink.h b/sys/osxaudio/gstosxaudiosink.h
index 7bd6309..aefdef0 100644
--- a/sys/osxaudio/gstosxaudiosink.h
+++ b/sys/osxaudio/gstosxaudiosink.h
@@ -1,6 +1,7 @@
 /*
  * GStreamer
  * Copyright 2005-2006 Zaheer Abbas Merali <zaheerabbas at merali dot org>
+ * Copyright 2007 Pioneers of the Inevitable <songbird@songbirdnest.com>
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -39,6 +40,11 @@
  * License along with this library; if not, write to the
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
+ * 
+ *  The development of this code was made possible due to the involvement of Pioneers of
+ *  the Inevitable, the creators of the Songbird Music player
+ *
+
  */
 
 #ifndef __GST_OSXAUDIOSINK_H__