Mercurial > pidgin
diff libpurple/media-gst.h @ 26767:47d03538ee3f
Fix a bad merge (*sigh*)
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Fri, 01 May 2009 18:57:44 +0000 |
parents | fd97c0de433d |
children | 8c991e09efcb |
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Fri, 01 May 2009 18:57:44 +0000 |
parents | fd97c0de433d |
children | 8c991e09efcb |