projects / platform / upstream / gst-plugins-base.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4feeea6) | patch
Remove conflict marker
authorMichael Smith <msmith@xiph.org>
Tue, 22 Nov 2005 16:33:29 +0000 (16:33 +0000)
committerMichael Smith <msmith@xiph.org>
Tue, 22 Nov 2005 16:33:29 +0000 (16:33 +0000)
commite558623852f70eb0463f0ea69e9cda672e0fc74d
tree6aa40b5962793823daccee5821d4c5aed7dc1e06tree | snapshot
parent4feeea6c13189b9b378e54b5e07abb6ccbdeeac8commit | diff
Remove conflict marker

Original commit message from CVS:
Remove conflict marker
ChangeLog diff | blob | history
Domain: Multimedia / Media Common;