mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-10-02 08:42:32 +00:00
ChangeLog: Remove cvs conflict marker.
Original commit message from CVS: * ChangeLog: Remove cvs conflict marker.
This commit is contained in:
parent
bc82d5536c
commit
954ddd9645
1 changed files with 5 additions and 1 deletions
|
@ -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>
|
||||
|
||||
* docs/README:
|
||||
|
@ -264,7 +269,6 @@
|
|||
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).
|
||||
|
||||
>>>>>>> 1.3935
|
||||
=== release 0.10.20 ===
|
||||
|
||||
2008-06-18 Jan Schmidt <jan.schmidt@sun.com>
|
||||
|
|
Loading…
Reference in a new issue