projects / platform / upstream / gstreamer.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: aff648a) | patch
Fix conflict marker
authorJan Schmidt <thaytan@mad.scientist.com>
Tue, 29 Nov 2005 15:15:38 +0000 (15:15 +0000)
committerJan Schmidt <thaytan@mad.scientist.com>
Tue, 29 Nov 2005 15:15:38 +0000 (15:15 +0000)
commit4c43a3273d1ed065a75f2334d6dfdb1cda79c11d
treebea6ed1fda6f9a99d1437444ee2a5529c733a9cetree | snapshot
parentaff648ab66d22e217f36cd91775bda181b56e2eecommit | diff
Fix conflict marker

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