Mercurial > pidgin.yaz
diff libpurple/mediamanager.h @ 27165:8671d9a37002
Fix merge error.
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Mon, 08 Jun 2009 04:42:33 +0000 |
parents | 317f8d7e88f1 |
children | 8c991e09efcb |
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Mon, 08 Jun 2009 04:42:33 +0000 |
parents | 317f8d7e88f1 |
children | 8c991e09efcb |