Mercurial > pidgin
diff libpurple/mediamanager.h @ 32150:3d5a0e9654ed
merge of '0acd4d77f5bd8bb02a3a73b6800be683bd7068f2'
and '6bee9aeec299196df3421d8fa5d0c663ae9f9e88'
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Mon, 12 Sep 2011 02:42:41 +0000 |
parents | 2b2b930281a0 |
children | 02a2e8183b1d |