mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-08 07:35:52 +00:00
Code Issues 1 Projects Releases Wiki Activity

changelog surgery, remove the conflict that has been there for 7 month

Browse source 
Original commit message from CVS:
changelog surgery, remove the conflict that has been there for 7 month
This commit is contained in:
Edward Hervey 2006-12-04 19:54:19 +00:00
parent d79b29c407
commit 3fb94f72dc
1 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -682,14 +682,6 @@
2006-04-19 Andy Wingo <wingo@pobox.com>
<<<<<<< ChangeLog
* gst/gstpad.override (pad_block_callback_marshal)
(_wrap_gst_pad_set_blocked_async): Fix refcounting problems and
indent.
2006-04-19 Andy Wingo <wingo@pobox.com>
=======
* gst/arg-types.py (GstCapsArg.write_const_param)
(GstCapsArg.write_param): If there is a default value, initialize
the py_caps variable to NULL. PyArgs_Parse* doesn't touch c
@ -702,7 +694,6 @@
2006-04-19 Andy Wingo <wingo@pobox.com>
>>>>>>> 1.447
* examples/remuxer.py: Another code dump. I know it breaks the
freeze but it's just a wee example :)