From 83e7dadbe6811b7f3f08dec75b09b7ae2667e003 Mon Sep 17 00:00:00 2001
From: Christian Schaller <uraeus@gnome.org>
Date: Tue, 27 Feb 2007 11:59:21 +0000
Subject: update copyright statement

Original commit message from CVS:
update copyright statement
---
 ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 046143e4..3ffd3178 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:
-- 
cgit