Mercurial > pidgin
comparison libpurple/mediamanager.c @ 32253:9173ec5a45cf
merge of '1b285d0b375fbd5e778db6bb852a7b089feb16a3'
and 'd1328041ee003fdee29a0cf6ae44b44727a49bb8'
author | Kevin Stange <kevin@simguy.net> |
---|---|
date | Sun, 02 Oct 2011 00:06:40 +0000 |
parents | d72d728226dc |
children | fd1b4bbefc6b |
comparison
equal
deleted
inserted
replaced
32252:a34977b4d858 | 32253:9173ec5a45cf |
---|