summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorChristian Schaller <uraeus@gnome.org>2007-02-27 11:59:21 +0000
committerChristian Schaller <uraeus@gnome.org>2007-02-27 11:59:21 +0000
commit83e7dadbe6811b7f3f08dec75b09b7ae2667e003 (patch)
tree4cef654ab7eb03f6d0cb43604fa0e579082b2ed6 /ChangeLog
parenta471de34bf1d316e98b2bd81829c7fff343ac375 (diff)
update copyright statement
Original commit message from CVS: update copyright statement
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 5 insertions, 0 deletions
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: