Mercurial > pidgin
comparison libpurple/mediamanager.c @ 29829:90dbc46a771f
Fixup merge
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Mon, 22 Mar 2010 22:26:14 +0000 |
parents | 2b2b930281a0 |
children | a8cc50c2279f |
comparison
equal
deleted
inserted
replaced
29828:f14cbb6a28a7 | 29829:90dbc46a771f |
---|