Mercurial > pidgin
diff pidgin/gtkmedia.c @ 32673:787609e41f20
explicit merge of 'f3961bf768b8a93583640b6058ba23d7f2c73c67'
and '60b08bb268ca62ab52c6223839341566e945a61d'
to branch 'im.pidgin.cpw.qulogic.gtk3'
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Sat, 08 Oct 2011 21:13:43 +0000 |
| parents | 6f503dcd843e 82f26939d2ba |
| children | 763d65f3f758 |