mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-19 16:21:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

ChangeLog: Remove cvs conflict marker.

Browse source 
Original commit message from CVS:
* ChangeLog:
Remove cvs conflict marker.
This commit is contained in:
Stefan Kost 2008-06-25 14:27:37 +00:00
parent bc82d5536c
commit 954ddd9645
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,8 @@
2008-06-25 Stefan Kost <ensonic@users.sf.net>
* ChangeLog:
Remove cvs conflict marker.
2008-06-25 Stefan Kost <ensonic@users.sf.net> 2008-06-25 Stefan Kost <ensonic@users.sf.net>
* docs/README: * docs/README:
@ -264,7 +269,6 @@
When a buffer is writable, its metadata is also writable so we don't When a buffer is writable, its metadata is also writable so we don't
need to subbuffer (which then makes the buffer not-writable anymore). need to subbuffer (which then makes the buffer not-writable anymore).
>>>>>>> 1.3935
=== release 0.10.20 === === release 0.10.20 ===
2008-06-18 Jan Schmidt <jan.schmidt@sun.com> 2008-06-18 Jan Schmidt <jan.schmidt@sun.com>