Mercurial > pidgin.yaz
comparison pidgin/gtkmedia.c @ 28040:b6f26015c51c
merge of '865afa7130542051d98f8e39bf3e0e6d8c70402c'
and 'dd1526faf6facf85e95bf0038da0760ffe613d5c'
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Mon, 27 Jul 2009 22:50:34 +0000 |
parents | df9042312063 |
children | 6e3c83e1057c 20798dc089af |
comparison
equal
deleted
inserted
replaced
28038:12ab4c1112e5 | 28040:b6f26015c51c |
---|