projects / platform / upstream / gstreamer.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d0c8e3a) | patch
whoops, de-conflictify
authorAndy Wingo <wingo@pobox.com>
Wed, 11 Feb 2004 13:28:59 +0000 (13:28 +0000)
committerAndy Wingo <wingo@pobox.com>
Wed, 11 Feb 2004 13:28:59 +0000 (13:28 +0000)
commite7995531e70ab8f1c98cd567e772694ad9bd3a6d
treeb05e1b5dab074806b0b6579bba3571f39d356137tree | snapshot
parentd0c8e3a9213bdee472d7a64e8b0ab50259526d7bcommit | diff
whoops, de-conflictify

Original commit message from CVS:
whoops, de-conflictify
ChangeLog diff | blob | history
Domain: Multimedia / Media Common;