diff options
Diffstat (limited to 'ChangeLog')
-rw-r--r-- | ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -1,3 +1,8 @@ +2007-02-27 Christian Schaller <christian at fluendo dot com> + + * sys/direct*: Add Pioneers of the Inevitable to copyright + * sys/macosxvideosink: Add Pioneers of the Inevitable to copyright + 2007-02-27 Edward Hervey <edward@fluendo.com> * sys/osxvideo/cocoawindow.h: @@ -19,6 +24,7 @@ Add a new plugin/library to make it easy for apps to shove data into a pipeline. +>>>>>>> 1.2426 2007-02-26 Tim-Philipp Müller <tim at centricular dot net> * gst/real/gstrealaudiodec.c: (gst_real_audio_dec_init): |