Mercurial > pidgin.yaz
comparison pidgin/gtkmedia.c @ 31061:d974e0268b5e
merge of '2872bcba5019558c0d77e8cf9b43801167e5efc8'
and '3cb4024617c6b97a4c383ddcabe7f047af92f68c'
author | John Bailey <rekkanoryo@rekkanoryo.org> |
---|---|
date | Thu, 21 Oct 2010 03:53:37 +0000 |
parents | b6c3000eec60 |
children | 11211e6427ae |
comparison
equal
deleted
inserted
replaced
31060:14a218feffe5 | 31061:d974e0268b5e |
---|